From fe3a83fd0f5930a5c87d4e82631e60d41d96993a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Mar 2017 13:13:58 +0300 Subject: [PATCH] [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,