From 59adda25fb2b6ecb9d92fbb2414f1ca67b27bb71 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 19 Apr 2024 17:43:41 +0300 Subject: [PATCH] [PE] Lock line space button when no paragraph object --- apps/presentationeditor/main/app/controller/Toolbar.js | 8 ++------ apps/presentationeditor/main/app/view/Toolbar.js | 5 +++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index cf9c206e06..6ea1a7c2ac 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -112,8 +112,7 @@ define([ clrhighlight: undefined, can_copycut: undefined, needCallApiBullets: undefined, - isLockedSlideHeaderAppyToAll: false, - in_para: undefined + isLockedSlideHeaderAppyToAll: false }; this._isAddingShape = false; this.slideSizeArr = [ @@ -868,10 +867,7 @@ define([ this._state.in_chart = in_chart; } - if (in_para !== this._state.in_para) { - this.toolbar.mnuLineSpaceOptions && this.toolbar.mnuLineSpaceOptions.setVisible(in_para); - this._state.in_para = in_para; - } + this.toolbar.lockToolbar(Common.enumLock.noParagraphObject, !in_para, {array: [me.toolbar.btnLineSpace]}); if (this._state.prcontrolsdisable !== paragraph_locked) { if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked; diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index e8bb575604..50c2b66178 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -101,7 +101,8 @@ define([ noAnimationDuration: 'no-animation-duration', timingLock: 'timing-lock', copyLock: 'can-copy', - fileMenuOpened: 'file-menu-opened' + fileMenuOpened: 'file-menu-opened', + noParagraphObject: 'no-paragraph-obj', }; for (var key in enumLock) { if (enumLock.hasOwnProperty(key)) { @@ -686,7 +687,7 @@ define([ id: 'id-toolbar-btn-linespace', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-linespace', - lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], + lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.noParagraphObject], menu: new Common.UI.Menu({ style: 'min-width: 60px;', items: [