Skip to content

W
web-apps
Commit f384ff0c authored by Julia Radzhabova's avatar Julia Radzhabova Committed by GitHub
Browse files
Options

Merge pull request #84 from ONLYOFFICE/release/v5.0.0 

Release/v5.0.0
parents c5e22a6a aad5adca
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 77 deletions
apps/api/documents/api.js
View file @ f384ff0c
......@@ -313,7 +313,7 @@
}
if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps))$/
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx))$/
.exec(_config.document.fileType);
if (!type) {
window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");
......@@ -649,7 +649,7 @@
app = appMap[config.documentType.toLowerCase()];
} else
if (!!config.document && typeof config.document.fileType === 'string') {
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides))$/
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm))$/
.exec(config.document.fileType);
if (type) {
if (typeof type[1] === 'string') app = appMap['spreadsheet']; else
......
apps/common/main/lib/component/Window.js
View file @ f384ff0c
......@@ -224,7 +224,7 @@ define([
var win_width = (this.initConfig.width=='auto') ? parseInt(this.$window.find('.body').css('width')) : this.initConfig.width;
var top = Math.floor(((parseInt(main_height) - parseInt(win_height)) / 2) * 0.9);
var top = Math.floor((parseInt(main_height) - parseInt(win_height)) / 2);
var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2);
this.$window.css('left',left);
......@@ -846,9 +846,9 @@ define([
'<div class="resize-border bottom" style="left: 4px; right: 4px; width: auto; z-index: 2; border-top-style: solid; cursor: s-resize;"></div>' +
'<div class="resize-border right bottom" style="border-bottom-right-radius: 5px; cursor: se-resize;"></div>' +
'<div class="resize-border right" style="top:' + ((this.initConfig.header) ? '33' : '5') + 'px; bottom: 5px; height: auto; border-left-style: solid; cursor: w-resize;"></div>' +
'<div class="resize-border left top" style="border-top-left-radius: 5px; cursor: se-resize;"></div>' +
'<div class="resize-border left top" style="border-top-left-radius: 5px; cursor: nw-resize;"></div>' +
'<div class="resize-border top" style="left: 4px; right: 4px; width: auto; z-index: 2; border-bottom-style:' + ((this.initConfig.header) ? "none" : "solid") + '; cursor: s-resize;"></div>' +
'<div class="resize-border right top" style="border-top-right-radius: 5px; cursor: sw-resize;"></div>';
'<div class="resize-border right top" style="border-top-right-radius: 5px; cursor: ne-resize;"></div>';
if (this.initConfig.header)
bordersTemplate += '<div class="resize-border left" style="top: 5px; height: 28px; cursor: e-resize;"></div>' +
'<div class="resize-border right" style="top: 5px; height: 28px; cursor: w-resize;"></div>';
......
apps/common/main/lib/view/Comments.js
View file @ f384ff0c
......@@ -759,7 +759,8 @@ define([
},
loadText: function () {
if (this.textVal && this.commentsView) {
this.commentsView.getTextBox().val(this.textVal);
var textBox = this.commentsView.getTextBox();
textBox && textBox.val(this.textVal);
}
},
getEditText: function () {
......
apps/common/main/lib/view/ExternalDiagramEditor.js
View file @ f384ff0c
......@@ -134,7 +134,7 @@ define([
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = ((Common.Utils.innerHeight() - parseInt(height)) / 2) * 0.9;
var top = (Common.Utils.innerHeight() - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);
......
apps/common/main/lib/view/ExternalMergeEditor.js
View file @ f384ff0c
......@@ -134,7 +134,7 @@ define([
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = ((Common.Utils.innerHeight() - parseInt(height)) / 2) * 0.9;
var top = (Common.Utils.innerHeight() - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);
......
apps/common/main/lib/view/Plugins.js
View file @ f384ff0c
......@@ -207,7 +207,7 @@ define([
var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
if (!_options.header) header_footer -= 34;
this.bordersOffset = 25;
this.bordersOffset = 40;
_options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width;
_options.height += header_footer;
_options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height;
......@@ -299,7 +299,7 @@ define([
Common.UI.Window.prototype.setWidth.call(this, width + borders_width);
this.$window.css('left',(maxWidth - width - borders_width) / 2);
this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2) * 0.9);
this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
},
onWindowResize: function() {
......
apps/common/main/resources/less/about.less
View file @ f384ff0c
.about-dlg {
.asc-about-office {
background-repeat: no-repeat;
.background-ximage('@{common-image-path}/about/OnlyOffice.png', '@{common-image-path}/about/OnlyOffice@2x.png', 420px);
.background-ximage('@{common-image-path}/about/OnlyOffice.png', '@{common-image-path}/about/OnlyOffice@2x.png', 340px);
width: 340px;
height: 55px;
......
apps/common/main/resources/less/comments.less
View file @ f384ff0c
......@@ -86,6 +86,7 @@
border: 1px solid @gray-dark;
word-break: break-all;
line-height: 15px;
color: @gray-deep;
}
.btn-fix {
......
apps/common/main/resources/less/window.less
View file @ f384ff0c
......@@ -14,7 +14,7 @@
left: 0;
width: 100%;
height: 100%;
opacity: 0;
opacity: 0.2;
background-color: rgb(0,0,0);
z-index: @zindex-modal - 1;
}
......@@ -96,6 +96,10 @@
&.modal {
z-index: @zindex-modal;
-ms-touch-action: none;
-moz-user-select:none;
-khtml-user-select:none;
user-select:none;
}
&.dethrone {
......
apps/common/mobile/resources/img/shapes/shape-06.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;}
</style>
<path class="st0" d="M17,8.5h31.5L56,16v31.5L48.5,55H17l-7.5-7.5V16L17,8.5z"/>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
</svg>
apps/common/mobile/resources/img/shapes/shape-15.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g>
<polygon id="XMLID_2_" points="56,30 56,25 25,25 25,14 9.5,27.3 25,40.5 25,30 51,30 51,50 56,50 56,30 "/>
</g>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
</svg>
apps/common/mobile/resources/img/shapes/shape-16.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g id="XMLID_3_">
<polygon id="XMLID_2_" points="9.5,30 9.5,25 40.5,25 40.5,14 56,27.3 40.5,40.5 40.5,30 14.5,30 14.5,50 9.5,50 9.5,30 "/>
</g>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25
11.75,53.25 "/>
</svg>
apps/documenteditor/mobile/app-dev.js
View file @ f384ff0c
......@@ -51,6 +51,8 @@ require.config({
text : '../vendor/requirejs-text/text',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
extendes : 'common/mobile/utils/extendes',
......@@ -115,6 +117,8 @@ require([
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'sockjs'
], function (Backbone, Framework7, Core) {
Backbone.history.start();
......
apps/documenteditor/mobile/app.js
View file @ f384ff0c
......@@ -51,6 +51,8 @@ require.config({
text : '../vendor/requirejs-text/text',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
......@@ -100,7 +102,9 @@ require.config({
'underscore',
'allfonts',
'xregexp',
'sockjs'
'sockjs',
'jszip',
'jsziputils'
]
},
gateway: {
......
apps/documenteditor/mobile/app/controller/add/AddShape.js
View file @ f384ff0c
......@@ -142,12 +142,12 @@ define([
{
title: 'Left arrow callout',
thumb: 'shape-15.svg',
type: 'leftArrowCallout'
type: 'leftArrow'
},
{
title: 'Right arrow callout',
thumb: 'shape-16.svg',
type: 'rightArrowCallout'
type: 'bentUpArrow'
},
{
title: 'Flow chart off page connector',
......
apps/documenteditor/mobile/resources/img/shapes/shape-06.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;}
</style>
<path class="st0" d="M17,8.5h31.5L56,16v31.5L48.5,55H17l-7.5-7.5V16L17,8.5z"/>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
</svg>
apps/documenteditor/mobile/resources/img/shapes/shape-15.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g>
<polygon id="XMLID_2_" points="56,30 56,25 25,25 25,14 9.5,27.3 25,40.5 25,30 51,30 51,50 56,50 56,30 "/>
</g>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
</svg>
apps/documenteditor/mobile/resources/img/shapes/shape-16.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g id="XMLID_3_">
<polygon id="XMLID_2_" points="9.5,30 9.5,25 40.5,25 40.5,14 56,27.3 40.5,40.5 40.5,30 14.5,30 14.5,50 9.5,50 9.5,30 "/>
</g>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25
11.75,53.25 "/>
</svg>
apps/presentationeditor/mobile/app/controller/add/AddShape.js
View file @ f384ff0c
......@@ -139,12 +139,12 @@ define([
{
title: 'Left arrow callout',
thumb: 'shape-15.svg',
type: 'leftArrowCallout'
type: 'leftArrow'
},
{
title: 'Right arrow callout',
thumb: 'shape-16.svg',
type: 'rightArrowCallout'
type: 'bentUpArrow'
},
{
title: 'Flow chart off page connector',
......
apps/presentationeditor/mobile/resources/img/shapes/shape-06.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;}
</style>
<path class="st0" d="M17,8.5h31.5L56,16v31.5L48.5,55H17l-7.5-7.5V16L17,8.5z"/>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
</svg>
apps/presentationeditor/mobile/resources/img/shapes/shape-15.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g>
<polygon id="XMLID_2_" points="56,30 56,25 25,25 25,14 9.5,27.3 25,40.5 25,30 51,30 51,50 56,50 56,30 "/>
</g>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
</svg>
apps/presentationeditor/mobile/resources/img/shapes/shape-16.svg
View file @ f384ff0c
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g id="XMLID_3_">
<polygon id="XMLID_2_" points="9.5,30 9.5,25 40.5,25 40.5,14 56,27.3 40.5,40.5 40.5,30 14.5,30 14.5,50 9.5,50 9.5,30 "/>
</g>
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25
11.75,53.25 "/>
</svg>
apps/spreadsheeteditor/embed/index.html
View file @ f384ff0c
......@@ -322,6 +322,8 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../sdk_dev_scripts.js"></script>
<script>
......
apps/spreadsheeteditor/embed/index.html.deploy
View file @ f384ff0c
......@@ -314,6 +314,8 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<!--sdk-->
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
......
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file @ f384ff0c
......@@ -740,10 +740,12 @@ define([
if (value) {
item = this.cmbRegSettings.store.findWhere({value: value});
this.cmbRegSettings.setValue(item ? item.get('value') : Common.util.LanguageInfo.getLocalLanguageName(value)[1]);
item && (value = this.cmbRegSettings.getValue());
} else {
this.cmbRegSettings.setValue((this.mode.lang) ? Common.util.LanguageInfo.getLocalLanguageName(parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.mode.lang)))[1] : 0x0409);
value = this.mode.lang ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.mode.lang)) : 0x0409;
this.cmbRegSettings.setValue(Common.util.LanguageInfo.getLocalLanguageName(value)[1]);
}
this.updateRegionalExample(this.cmbRegSettings.getValue());
this.updateRegionalExample(value);
},
applySettings: function() {
......
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
View file @ f384ff0c
......@@ -134,7 +134,7 @@ define([
main_height = Common.Utils.innerHeight();
}
top = ((parseInt(main_height, 10) - parseInt(win_height, 10)) / 2) * 0.9;
top = (parseInt(main_height, 10) - parseInt(win_height, 10)) / 2;
left = (parseInt(main_width, 10) - parseInt(this.initConfig.width, 10)) / 2;
this.$window.css('left', Math.floor(left));
......
apps/spreadsheeteditor/main/resources/formula-lang/en_desc.json
View file @ f384ff0c
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/spreadsheeteditor/main/resources/formula-lang/ru_desc.json
View file @ f384ff0c
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/spreadsheeteditor/mobile/app-dev.js
View file @ f384ff0c
......@@ -51,6 +51,8 @@ require.config({
text : '../vendor/requirejs-text/text',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
extendes : 'common/mobile/utils/extendes',
......@@ -97,6 +99,8 @@ require([
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'sockjs'
], function (Backbone, Framework7) {
Backbone.history.start();
......
apps/spreadsheeteditor/mobile/app.js
View file @ f384ff0c
......@@ -51,6 +51,8 @@ require.config({
text : '../vendor/requirejs-text/text',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api',
......@@ -77,7 +79,9 @@ require.config({
'underscore',
'allfonts',
'xregexp',
'sockjs'
'sockjs',
'jszip',
'jsziputils'
]
},
backbone: {
......
apps/spreadsheeteditor/mobile/app/controller/add/AddShape.js
View file @ f384ff0c
......@@ -138,12 +138,12 @@ define([
{
title: 'Left arrow callout',
thumb: 'shape-15.svg',
type: 'leftArrowCallout'
type: 'leftArrow'
},
{
title: 'Right arrow callout',
thumb: 'shape-16.svg',
type: 'rightArrowCallout'
type: 'bentUpArrow'
},
{
title: 'Flow chart off page connector',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7