From b62a98c7aaf4af4bb8be079dab49231b3f66e9e9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 29 Aug 2016 11:01:44 +0300 Subject: [PATCH 1/6] [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 21fc5848c6..d605b098cd 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 2/6] [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 64bdddd253..9085b782dc 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 3/6] 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 a99f28bd0b..a8243aa70f 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 4/6] 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 1215b908dd..4d8a7a52f9 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 f9e3f5a125..dc442c17e9 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 0e15cd67b3..4f77c4f4ab 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 5/6] 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 2025d3f26a..8af21c295e 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 6/6] 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 f162567634..58fe87d543 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 ee9c6ad104..898e2bf736 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 608db16df8..2bdf1f5034 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 617b80c8ef..bed18a9a03 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 1198823484..fcf944a69b 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 7cfa3161f3..0c6aaa3544 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",