From fe3a83fd0f5930a5c87d4e82631e60d41d96993a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Mar 2017 13:13:58 +0300 Subject: [PATCH 1/3] [PE] Strict co-editing: lock themes control when other users changed theme. --- apps/presentationeditor/main/app/controller/Toolbar.js | 4 ++-- apps/presentationeditor/main/app/view/Toolbar.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 697259535..8fc9a531a 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -697,11 +697,11 @@ define([ }, onApiLockDocumentTheme: function() { - this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas]}); + this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]}); }, onApiUnLockDocumentTheme: function() { - this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas]}); + this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]}); }, onApiCoAuthoringDisconnect: function(disableDownload) { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 9efe750df..56a3cb5dd 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -855,7 +855,7 @@ define([ enableKeyEvents: true, itemHeight : 38, hint: this.tipSlideTheme, - lock: [_set.lostConnect, _set.noSlides], + lock: [_set.themeLock, _set.lostConnect, _set.noSlides], beforeOpenHandler: function(e) { var cmp = this, menu = cmp.openButton.menu, From d7baf269f5b3d34785e414e1b2d83651b57538d0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Mar 2017 14:22:12 +0300 Subject: [PATCH 2/3] [DE][PE] Fix Bug 29356, fix Bug 33671. --- apps/documenteditor/main/app/controller/Main.js | 7 ++++++- apps/documenteditor/main/locale/en.json | 1 + apps/documenteditor/mobile/app/controller/Main.js | 7 ++++++- apps/documenteditor/mobile/locale/en.json | 1 + apps/presentationeditor/main/app/controller/Main.js | 7 ++++++- apps/presentationeditor/main/locale/en.json | 1 + apps/presentationeditor/mobile/app/controller/Main.js | 7 ++++++- apps/presentationeditor/mobile/locale/en.json | 1 + 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 4467c6588..c100765a2 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1258,6 +1258,10 @@ define([ config.msg = this.errorAccessDeny; break; + case Asc.c_oAscError.ID.UplImageUrl: + config.msg = this.errorBadImageUrl; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -2116,7 +2120,8 @@ define([ errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.', titleServerVersion: 'Editor updated', errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', - textChangesSaved: 'All changes saved' + textChangesSaved: 'All changes saved', + errorBadImageUrl: 'Image url is incorrect' } })(), DE.Controllers.Main || {})) }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 177619463..ba1a65e3a 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -301,6 +301,7 @@ "DE.Controllers.Main.titleServerVersion": "Editor updated", "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", "DE.Controllers.Main.textChangesSaved": "All changes saved", + "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "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/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index c0fc83dd6..ecb792aa4 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -810,6 +810,10 @@ define([ config.msg = this.errorConnectToServer; break; + case Asc.c_oAscError.ID.UplImageUrl: + config.msg = this.errorBadImageUrl; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1211,7 +1215,8 @@ define([ textClose: 'Close', textDone: 'Done', titleServerVersion: 'Editor updated', - errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.' + errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', + errorBadImageUrl: 'Image url is incorrect' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 1ae49bb91..0578df115 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -69,6 +69,7 @@ "DE.Controllers.Main.errorUsersExceed": "The number of users was exceeded", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", + "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "DE.Controllers.Main.loadFontsTextText": "Loading data...", "DE.Controllers.Main.loadFontsTitleText": "Loading Data", "DE.Controllers.Main.loadFontTextText": "Loading data...", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 24dacb384..c8f5ec0b8 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1010,6 +1010,10 @@ define([ config.msg = this.errorAccessDeny; break; + case Asc.c_oAscError.ID.UplImageUrl: + config.msg = this.errorBadImageUrl; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1905,7 +1909,8 @@ define([ errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.', titleServerVersion: 'Editor updated', errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', - textChangesSaved: 'All changes saved' + textChangesSaved: 'All changes saved', + errorBadImageUrl: 'Image url is incorrect' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 4ea67bdc0..fe010e70d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -248,6 +248,7 @@ "PE.Controllers.Main.titleServerVersion": "Editor updated", "PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", "PE.Controllers.Main.textChangesSaved": "All changes saved", + "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "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.textAccent": "Accents", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 57848bd51..c7db0bd76 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -762,6 +762,10 @@ define([ config.msg = this.errorConnectToServer; break; + case Asc.c_oAscError.ID.UplImageUrl: + config.msg = this.errorBadImageUrl; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1213,7 +1217,8 @@ define([ textClose: 'Close', textDone: 'Done', titleServerVersion: 'Editor updated', - errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.' + errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', + errorBadImageUrl: 'Image url is incorrect' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index a0a4de085..9e5280b5e 100755 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -83,6 +83,7 @@ "PE.Controllers.Main.errorUsersExceed": "The number of users was exceeded", "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.", "PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", + "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "PE.Controllers.Main.loadFontsTextText": "Loading data...", "PE.Controllers.Main.loadFontsTitleText": "Loading Data", "PE.Controllers.Main.loadFontTextText": "Loading data...", From 7225e7db71a86703a44222313e777aa52b94817e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Mar 2017 14:38:44 +0300 Subject: [PATCH 3/3] Fix Bug 34590. --- apps/common/main/resources/less/comments.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index af57564b7..e88e72717 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -295,7 +295,7 @@ height: 20px; line-height: @line-height-base; background-color: #EE3525; - margin: 18px 25px; + margin: 10px 18px; padding: 2px 10px; color: #fff; overflow: hidden;