From 84832c6fe1e511bf29a71e86319ee751dc59a0b6 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Fri, 26 Aug 2016 13:49:42 +0300 Subject: [PATCH 01/16] fix bug 33000 --- apps/common/main/resources/less/plugins.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index a99f28bd0..a8243aa70 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -58,11 +58,14 @@ } .plugin-caret { - float: right; + //float: right; width: 16px; height: 16px; background-position: -1px -274px; margin: 7px; + display: inline-block; + position: absolute; + right: 0; } } } From b62a98c7aaf4af4bb8be079dab49231b3f66e9e9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 11:01:44 +0300 Subject: [PATCH 02/16] [SSE] Fix Bug 33007 --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 21fc5848c..d605b098c 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -530,7 +530,7 @@ define([ onHorizontalAlign: function(type, btn, e) { this._state.pralign = undefined; if (this.api) { - this.api.asc_setCellAlign(!btn.pressed ? 'left' : type); + this.api.asc_setCellAlign(!btn.pressed ? 'none' : type); this.toolbar.btnWrap.allowDepress = !(type == 'justify'); } @@ -550,7 +550,7 @@ define([ this._state.pralign = undefined; if (this.api) - this.api.asc_setCellAlign(!item.checked ? 'left' : item.value); + this.api.asc_setCellAlign(!item.checked ? 'none' : item.value); this.toolbar.btnWrap.allowDepress = !(item.value == 'justify'); From 9d43ac5a4b2a8dd65e90ca989341e3a58c5780aa Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 11:16:31 +0300 Subject: [PATCH 03/16] [DE] Fix Bug 32999. --- .../main/app/view/ShapeSettings.js | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 64bdddd25..9085b782d 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1455,23 +1455,25 @@ define([ onInitStandartTextures: function(texture) { var me = this; if (texture && texture.length>0){ - this.btnTexture = new Common.UI.ComboBox({ - el: $('#shape-combo-fill-texture'), - template: _.template([ - '
', - '
' + this.textSelectTexture + '
', - '
', - '', - '
' - ].join('')) - }); - this.textureMenu = new Common.UI.Menu({ - items: [ - { template: _.template('
') } - ] - }); - this.textureMenu.render($('#shape-combo-fill-texture')); - this.fillControls.push(this.btnTexture); + if (!this.btnTexture) { + this.btnTexture = new Common.UI.ComboBox({ + el: $('#shape-combo-fill-texture'), + template: _.template([ + '
', + '
' + this.textSelectTexture + '
', + '
', + '', + '
' + ].join('')) + }); + this.textureMenu = new Common.UI.Menu({ + items: [ + { template: _.template('
') } + ] + }); + this.textureMenu.render($('#shape-combo-fill-texture')); + this.fillControls.push(this.btnTexture); + } var texturearray = []; _.each(texture, function(item){ From b7ddb8ba5261390510de5232c3af73fc55fba618 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Fri, 26 Aug 2016 13:49:42 +0300 Subject: [PATCH 04/16] fix bug 33000 --- apps/common/main/resources/less/plugins.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index a99f28bd0..a8243aa70 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -58,11 +58,14 @@ } .plugin-caret { - float: right; + //float: right; width: 16px; height: 16px; background-position: -1px -274px; margin: 7px; + display: inline-block; + position: absolute; + right: 0; } } } From 2bb4486c72cc9bbff2673359000e9ce316329821 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 14:32:04 +0300 Subject: [PATCH 05/16] Fixed Bug 29737. --- apps/documenteditor/main/resources/less/layout.less | 1 + apps/presentationeditor/main/resources/less/layout.less | 1 + apps/spreadsheeteditor/main/resources/less/layout.less | 1 + 3 files changed, 3 insertions(+) diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 1215b908d..4d8a7a52f 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -3,6 +3,7 @@ body { height: 100%; .user-select(none); color: @gray-deep; + position: fixed; &.safari { position: absolute; diff --git a/apps/presentationeditor/main/resources/less/layout.less b/apps/presentationeditor/main/resources/less/layout.less index f9e3f5a12..dc442c17e 100644 --- a/apps/presentationeditor/main/resources/less/layout.less +++ b/apps/presentationeditor/main/resources/less/layout.less @@ -3,6 +3,7 @@ body { height: 100%; .user-select(none); color: @gray-deep; + position: fixed; &.safari { position: absolute; diff --git a/apps/spreadsheeteditor/main/resources/less/layout.less b/apps/spreadsheeteditor/main/resources/less/layout.less index 0e15cd67b..4f77c4f4a 100644 --- a/apps/spreadsheeteditor/main/resources/less/layout.less +++ b/apps/spreadsheeteditor/main/resources/less/layout.less @@ -3,6 +3,7 @@ body { height: 100%; .user-select(none); color: @gray-deep; + position: fixed; &.safari { position: absolute; From 769042fc93ef2ad9b6895f3297b021ba5c78c458 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 14:45:09 +0300 Subject: [PATCH 06/16] Window: add alert without footer and close button. --- apps/common/main/lib/component/Window.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 2025d3f26..8af21c295 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -400,7 +400,7 @@ define([ } } options.dontshow = options.dontshow || false; - + if (!options.width) options.width = 'auto'; var template = '
' + @@ -410,24 +410,22 @@ define([ '
' + '' + '<% if (dontshow) { %>
<% } %>' + - '
' + - '<% if (_.size(buttons) > 0) { %>' + + '<% if (_.size(buttons) > 0) { %>' + + '
' + '<% for(var bt in buttons) { %>' + ''+ '<% } %>' + - '<% } else { %>' + - ''+ - '<% } %>' + - '
'; + '
' + + '<% } %>'; - var win = new Common.UI.Window({ + _.extend(options, { cls: 'alert', - title: options.title, - width: options.width, onprimary: onKeyDown, tpl: _.template(template, options) - }), - chDontShow = null; + }); + + var win = new Common.UI.Window(options), + chDontShow = null; function autoSize(window) { var text_cnt = window.getChild('.info-box'); From a69dd755bde7f4a52c79847ec0c99b732290e51f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 14:46:15 +0300 Subject: [PATCH 07/16] Added support for different license types. --- .../main/app/controller/Main.js | 19 ++++++++++++++++--- apps/documenteditor/main/locale/en.json | 2 ++ .../main/app/controller/Main.js | 19 ++++++++++++++++--- apps/presentationeditor/main/locale/en.json | 2 ++ .../main/app/controller/Main.js | 19 ++++++++++++++++--- apps/spreadsheeteditor/main/locale/en.json | 2 ++ 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index f16256763..58fe87d54 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -921,9 +921,20 @@ define([ }, onEditorPermissions: function(params) { + var licType = params.asc_getLicenseType(); + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + Common.UI.warning({ + title: this.titleLicenseExp, + msg: this.warnLicenseExp, + buttons: [], + closable: false + }); + return; + } + this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review; this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); - this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; + this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success); this.appOptions.isLightVersion = params.asc_getIsLight(); /** coauthoring begin **/ this.appOptions.canCoAuthoring = !this.appOptions.isLightVersion; @@ -949,7 +960,7 @@ define([ this.appOptions.canDownloadOrigin = !this.appOptions.nativeApp && this.permissions.download !== false && (type && typeof type[1] === 'string'); this.appOptions.canDownload = !this.appOptions.nativeApp && this.permissions.download !== false && (!type || typeof type[1] !== 'string'); - this._state.licenseWarning = !this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; + this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; this.appOptions.canBranding = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); if (this.appOptions.canBranding) { @@ -1863,7 +1874,9 @@ define([ textNoLicenseTitle: 'ONLYOFFICE open source version', warnNoLicense: 'You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.', textContactUs: 'Contact sales', - errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.' + errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.', + warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', + titleLicenseExp: 'License expired' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index ee9c6ad10..898e2bf73 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -277,6 +277,8 @@ "DE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", + "DE.Controllers.Main.titleLicenseExp": "License expired", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", "DE.Controllers.Statusbar.zoomText": "Zoom {0}%", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 608db16df..2bdf1f503 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -712,8 +712,19 @@ define([ }, onEditorPermissions: function(params) { + var licType = params.asc_getLicenseType(); + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + Common.UI.warning({ + title: this.titleLicenseExp, + msg: this.warnLicenseExp, + buttons: [], + closable: false + }); + return; + } + this.appOptions.isOffline = this.api.asc_isOffline(); - this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; + this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success); this.appOptions.isLightVersion = params.asc_getIsLight(); /** coauthoring begin **/ this.appOptions.canCoAuthoring = !this.appOptions.isLightVersion; @@ -728,7 +739,7 @@ define([ this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false); this.appOptions.canPrint = (this.permissions.print !== false); - this._state.licenseWarning = !this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; + this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; this.appOptions.canBranding = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); if (this.appOptions.canBranding) { @@ -1666,7 +1677,9 @@ define([ textNoLicenseTitle: 'ONLYOFFICE open source version', warnNoLicense: 'You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.', textContactUs: 'Contact sales', - errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.' + errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.', + warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', + titleLicenseExp: 'License expired' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 617b80c8e..bed18a9a0 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -223,6 +223,8 @@ "PE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", + "PE.Controllers.Main.titleLicenseExp": "License expired", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 119882348..fcf944a69 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -733,12 +733,23 @@ define([ }, onEditorPermissions: function(params) { + var licType = params.asc_getLicenseType(); + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + Common.UI.warning({ + title: this.titleLicenseExp, + msg: this.warnLicenseExp, + buttons: [], + closable: false + }); + return; + } + if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) { this.appOptions.canAutosave = true; this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); this.appOptions.isOffline = this.api.asc_isOffline(); - this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; + this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success); this.appOptions.isLightVersion = params.asc_getIsLight(); /** coauthoring begin **/ this.appOptions.canCoAuthoring = !this.appOptions.isLightVersion; @@ -759,7 +770,7 @@ define([ this.appOptions.canDownload = !this.appOptions.nativeApp && (this.permissions.download !== false); this.appOptions.canPrint = (this.permissions.print !== false); - this._state.licenseWarning = !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) && !this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; + this._state.licenseWarning = !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) && (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; this.applyModeCommonElements(); this.applyModeEditorElements(); @@ -1882,7 +1893,9 @@ define([ warnNoLicense: 'You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.', textContactUs: 'Contact sales', confirmPutMergeRange: 'The source data contains merged cells.
They will be unmerged before they are pasted into the table.', - errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.' + errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.', + warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', + titleLicenseExp: 'License expired' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 7cfa3161f..0c6aaa354 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -233,6 +233,8 @@ "SSE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", + "SSE.Controllers.Main.titleLicenseExp": "License expired", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect", From 4ffe882f08d0027f7d2e66337d6cfff94bfacc57 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 16:45:10 +0300 Subject: [PATCH 08/16] Fix Bug 33027. --- apps/documenteditor/main/app/view/ImageSettings.js | 6 +++--- apps/presentationeditor/main/app/view/ImageSettings.js | 6 +++--- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index c80591e70..6f0cb29d5 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -242,10 +242,10 @@ define([ if (this._state.isOleObject) { var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); - this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); + this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked); } else { - this.btnInsertFromUrl.setDisabled(pluginGuid===null); - this.btnInsertFromFile.setDisabled(pluginGuid===null); + this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked); + this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked); } } }, diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 18a8b9d9e..5310720f2 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -181,10 +181,10 @@ define([ if (this._state.isOleObject) { var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); - this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); + this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked); } else { - this.btnInsertFromUrl.setDisabled(pluginGuid===null); - this.btnInsertFromFile.setDisabled(pluginGuid===null); + this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked); + this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked); } } }, diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 3cbb70b3a..e3c0e02ac 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -236,10 +236,10 @@ define([ if (this._state.isOleObject) { var plugin = SSE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); - this.btnEditObject.setDisabled(plugin===null || plugin ===undefined); + this.btnEditObject.setDisabled(plugin===null || plugin ===undefined || this._locked); } else { - this.btnInsertFromUrl.setDisabled(pluginGuid===null); - this.btnInsertFromFile.setDisabled(pluginGuid===null); + this.btnInsertFromUrl.setDisabled(pluginGuid===null || this._locked); + this.btnInsertFromFile.setDisabled(pluginGuid===null || this._locked); } } }, From 878f1880c335dbebf1c674ba6dea6245f1c7f571 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 16:46:31 +0300 Subject: [PATCH 09/16] Point chart -> XY (Scatter) Chart --- apps/documenteditor/main/app/view/ChartSettings.js | 2 +- apps/documenteditor/main/app/view/Toolbar.js | 2 +- apps/presentationeditor/main/app/view/ChartSettings.js | 2 +- apps/presentationeditor/main/app/view/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/view/ChartSettings.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 0685cd7f6..a1d7a1ba8 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -577,7 +577,7 @@ define([ textBar: 'Bar Chart', textArea: 'Area Chart', textPie: 'Pie Chart', - textPoint: 'Point Chart', + textPoint: 'XY (Scatter) Chart', textStock: 'Stock Chart', textStyle: 'Style' diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 064dcb8db..5d66eadee 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1815,7 +1815,7 @@ define([ textBar: 'Bar Chart', textArea: 'Area Chart', textPie: 'Pie Chart', - textPoint: 'Point Chart', + textPoint: 'XY (Scatter) Chart', textStock: 'Stock Chart', tipColorSchemas: 'Change Color Scheme', tipInsertText: 'Insert Text', diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 175d1d459..9a8df02d2 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -512,7 +512,7 @@ define([ textBar: 'Bar Chart', textArea: 'Area Chart', textPie: 'Pie Chart', - textPoint: 'Point Chart', + textPoint: 'XY (Scatter) Chart', textStock: 'Stock Chart', textStyle: 'Style' }, PE.Views.ChartSettings || {})); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 353d45ffa..8d2b9802e 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1595,7 +1595,7 @@ define([ textBar: 'Bar Chart', textArea: 'Area Chart', textPie: 'Pie Chart', - textPoint: 'Point Chart', + textPoint: 'XY (Scatter) Chart', textStock: 'Stock Chart', tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.', txtScheme1: 'Office', diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 923acfc3e..6963a5723 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -528,7 +528,7 @@ define([ textBar: 'Bar Chart', textArea: 'Area Chart', textPie: 'Pie Chart', - textPoint: 'Point Chart', + textPoint: 'XY (Scatter) Chart', textStock: 'Stock Chart', textStyle: 'Style', textAdvanced: 'Show advanced settings' From 1e1ea2c49f346a5a7a958d39992bd073b6341d0b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 17:26:34 +0300 Subject: [PATCH 10/16] [SSE] Bug with plugin editing. --- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index e3c0e02ac..72e38c1b9 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -80,6 +80,7 @@ define([ this._locked = false; this._noApply = false; + this._originalProps = null; this.render(); @@ -199,6 +200,8 @@ define([ this.disableControls(this._locked); if (props ){ + this._originalProps = new Asc.asc_CImgProperty(props); + var value = props.asc_getWidth(); if ( Math.abs(this._state.Width-value)>0.001 || (this._state.Width===null || value===null)&&(this._state.Width!==value)) { From b0c7c000f769867eeea195e3a2a34197d6000217 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 17:54:19 +0300 Subject: [PATCH 11/16] Fix Bug 32998. --- apps/common/main/lib/component/ComboBox.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 2687b0e23..35f3ca96f 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -211,8 +211,17 @@ define([ openMenu: function(delay) { var me = this; + if ( !this.scroller ) { + this.scroller = new Common.UI.Scroller(_.extend({ + el: $('.dropdown-menu', this.cmpEl), + minScrollbarLength: 40, + scrollYMarginOffset: 30, + includePadding: true + }, this.options.scroller)); + } + _.delay(function(){ - me.cmpEl.addClass('open') + me.cmpEl.addClass('open'); }, delay || 0); }, From 20a70db963dd21fa9244dd837153fd5aee05268e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 10:00:29 +0300 Subject: [PATCH 12/16] Fix Bug 33031. --- .../main/app/controller/Main.js | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index fcf944a69..51e16aae8 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -733,18 +733,19 @@ define([ }, onEditorPermissions: function(params) { - var licType = params.asc_getLicenseType(); - if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { - Common.UI.warning({ - title: this.titleLicenseExp, - msg: this.warnLicenseExp, - buttons: [], - closable: false - }); - return; - } + var licType = params ? params.asc_getLicenseType() : Asc.c_oLicenseResult.Error; + + if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) { + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + Common.UI.warning({ + title: this.titleLicenseExp, + msg: this.warnLicenseExp, + buttons: [], + closable: false + }); + return; + } - if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) { this.appOptions.canAutosave = true; this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); From b3e6c31393043f5353943ff76377cea8fa91504e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 11:31:31 +0300 Subject: [PATCH 13/16] [PE] Fix bug 33002, changes for bug 32497 --- .../presentationeditor/main/app/view/DocumentHolder.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 00b3f7d00..c8d64a440 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -686,8 +686,11 @@ define([ }; var onApiCurrentPages = function(number) { - if (me.currentMenu && me.currentMenu.isVisible()) - me.currentMenu.hide(); + if (me.currentMenu && me.currentMenu.isVisible()) { + if (me._isFromSlideMenu !== true && me._isFromSlideMenu !== number) + me.currentMenu.hide(); + me._isFromSlideMenu = number; + } }; this.setApi = function(o) { @@ -903,6 +906,7 @@ define([ caption : me.txtDeleteSlide }).on('click', _.bind(function(item) { if (me.api){ + me._isFromSlideMenu = true; me.api.DeleteSlide(); me.fireEvent('editcomplete', this); @@ -1010,6 +1014,7 @@ define([ caption : me.txtNewSlide }).on('click', function(item) { if (me.api) { + me._isFromSlideMenu = true; me.api.AddSlide(); me.fireEvent('editcomplete', this); @@ -1020,6 +1025,7 @@ define([ caption : me.txtDuplicateSlide }).on('click', function(item){ if (me.api) { + me._isFromSlideMenu = true; me.api.DublicateSlide(); me.fireEvent('editcomplete', this); From 7dc8c7534bb1746a346c320f70246b9f4c5142fb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 11:34:27 +0300 Subject: [PATCH 14/16] [PE] Fix Bug 32042. --- .../main/app/view/DocumentHolder.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index c8d64a440..5c272393f 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -188,12 +188,19 @@ define([ var onFocusObject = function(selectedElements) { if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible()){ - var obj = fillMenuProps(selectedElements); - if (obj) { - if (obj.menu_to_show===me.currentMenu) { - me.currentMenu.options.initMenu(obj.menu_props); + if (me.api.asc_getCurrentFocusObject() === 0 ){ // thumbnails + if (me.slideMenu===me.currentMenu) { + me.currentMenu.options.initMenu({isSlideSelect: me.slideMenu.items[2].isVisible(), fromThumbs: true}); me.currentMenu.alignPosition(); } + } else { + var obj = fillMenuProps(selectedElements); + if (obj) { + if (obj.menu_to_show===me.currentMenu) { + me.currentMenu.options.initMenu(obj.menu_props); + me.currentMenu.alignPosition(); + } + } } } }; From 1c5cfdb4004c8cafaa6760e303e94c5b8ff24287 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 13:30:11 +0300 Subject: [PATCH 15/16] Added license type Asc.c_oLicenseResult.ExpiredTrial. --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 58fe87d54..8996ee31a 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -922,7 +922,7 @@ define([ onEditorPermissions: function(params) { var licType = params.asc_getLicenseType(); - if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) { Common.UI.warning({ title: this.titleLicenseExp, msg: this.warnLicenseExp, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 2bdf1f503..d1a3953dd 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -713,7 +713,7 @@ define([ onEditorPermissions: function(params) { var licType = params.asc_getLicenseType(); - if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) { Common.UI.warning({ title: this.titleLicenseExp, msg: this.warnLicenseExp, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 51e16aae8..88bc52c9b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -736,7 +736,7 @@ define([ var licType = params ? params.asc_getLicenseType() : Asc.c_oLicenseResult.Error; if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) { - if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) { Common.UI.warning({ title: this.titleLicenseExp, msg: this.warnLicenseExp, From 5779ec35ebdb94ca0abd5e62bbcbf0272714717b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Aug 2016 13:31:31 +0300 Subject: [PATCH 16/16] [DE] Fix Bug 33032. --- apps/documenteditor/mobile/index.html.deploy | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/apps/documenteditor/mobile/index.html.deploy b/apps/documenteditor/mobile/index.html.deploy index 7cf32f8b8..61a898732 100644 --- a/apps/documenteditor/mobile/index.html.deploy +++ b/apps/documenteditor/mobile/index.html.deploy @@ -53,16 +53,6 @@ margin-bottom: 5px; } - .loader-page-text { - display: inline-block; - font-size: 14px; - margin-left: 80px; - margin-top: 125px; - color: #888; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - line-height: 20px; - } - .romb { width: 40px; height: 40px;