diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 796b7e609c..e39b685444 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3679,6 +3679,7 @@ define([ } Array.prototype.push.apply(this.toolbar.paragraphControls, this.btnsComment); Array.prototype.push.apply(this.toolbar.lockControls, this.btnsComment); + Common.UI.LayoutManager.addControls(this.btnsComment); } (new Promise(function(accept) { diff --git a/apps/pdfeditor/main/app/view/InsTab.js b/apps/pdfeditor/main/app/view/InsTab.js index f898a1e4a3..a55e26b8e7 100644 --- a/apps/pdfeditor/main/app/view/InsTab.js +++ b/apps/pdfeditor/main/app/view/InsTab.js @@ -303,7 +303,7 @@ define([ dataHintOffset: '-16, 0' }); me.lockedControls.push(me.cmbInsertShape); - + Common.UI.LayoutManager.addControls(me.lockedControls); Common.Utils.lockControls(_set.disableOnStart, true, {array: this.lockedControls}); }, @@ -345,6 +345,7 @@ define([ var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddPage); Common.Utils.lockControls(Common.enumLock.disableOnStart, true, {array: created}); Array.prototype.push.apply(this.lockedControls, created); + Common.UI.LayoutManager.addControls(created); return this.$el; }, diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index 587c1e2954..0395b77232 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -758,7 +758,7 @@ define([ }), }); arr.push(this.btnRotatePage); - + Common.UI.LayoutManager.addControls(arr); return arr; }, @@ -1153,6 +1153,7 @@ define([ // Disable all components before load document this.lockControls = me.toolbarControls.concat(me.paragraphControls).concat(me.shapeControls); + Common.UI.LayoutManager.addControls(this.lockControls); this.lockToolbar(Common.enumLock.disableOnStart, true, {array: this.lockControls}); this.on('render:after', _.bind(this.onToolbarAfterRender, this)); diff --git a/apps/pdfeditor/main/app/view/ViewTab.js b/apps/pdfeditor/main/app/view/ViewTab.js index 79af6a6f74..daac818fce 100644 --- a/apps/pdfeditor/main/app/view/ViewTab.js +++ b/apps/pdfeditor/main/app/view/ViewTab.js @@ -242,7 +242,7 @@ define([ dataHintOffset: 'small' }); this.lockedControls.push(this.chRightMenu); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.Utils.lockControls(_set.disableOnStart, true, {array: this.lockedControls}); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, @@ -308,7 +308,7 @@ define([ var created = this.btnsFitToPage.concat(this.btnsFitToWidth).concat(this.cmbsZoom); Common.Utils.lockControls(Common.enumLock.disableOnStart, true, {array: created}); Array.prototype.push.apply(this.lockedControls, created); - + Common.UI.LayoutManager.addControls(created); return this.$el; }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 1370cb2e48..71308a9ab7 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2839,6 +2839,7 @@ define([ if ( this.btnsComment.length ) { var _comments = PE.getController('Common.Controllers.Comments').getView(); Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment); + Common.UI.LayoutManager.addControls(this.btnsComment); this.btnsComment.forEach(function (btn) { btn.updateHint( _comments.textHintAddComment ); btn.on('click', function (btn, e) { diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index 73b84b12b7..b6cc452abe 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -468,7 +468,7 @@ define([ dataHintOffset: 'medium' }); this.lockedControls.push(this.btnMoveLater); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 5f0ee0d11b..11f94102b1 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1223,7 +1223,7 @@ define([ this.btnInsertEquation, this.btnInsertSymbol, this.btnInsertHyperlink, this.btnColorSchemas, this.btnSlideSize, this.listTheme, this.mnuShowSettings, this.cmbInsertShape, this.btnInsertPlaceholder, this.chTitle, this.chFooters ]; - + Common.UI.LayoutManager.addControls(this.lockControls); // Disable all components before load document _.each([me.btnSave] .concat(me.paragraphControls), @@ -1391,7 +1391,7 @@ define([ Array.prototype.push.apply(this.slideOnlyControls, created); Array.prototype.push.apply(this.lockControls, created); - + Common.UI.LayoutManager.addControls(created); this.btnPrint.menu && this.btnPrint.$el.addClass('split'); return $host; }, diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js index 7097a9e42e..39533a8469 100644 --- a/apps/presentationeditor/main/app/view/Transitions.js +++ b/apps/presentationeditor/main/app/view/Transitions.js @@ -278,7 +278,7 @@ define([ dataHintOffset: 'small' }); this.lockedControls.push(this.chDelay); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.Utils.lockControls(Common.enumLock.disableOnStart, true, {array: this.lockedControls}); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js index ecf5408dfa..9633f1ce1a 100644 --- a/apps/presentationeditor/main/app/view/ViewTab.js +++ b/apps/presentationeditor/main/app/view/ViewTab.js @@ -374,7 +374,7 @@ define([ dataHintOffset: 'small' }); this.lockedControls.push(this.chLeftMenu); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index ba61d3ddd4..ea5423fae7 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -4697,6 +4697,7 @@ define([ this.btnsComment.add(_comments.buttonAddNew); } Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment); + Common.UI.LayoutManager.addControls(this.btnsComment); } } diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index 4fc9907c92..8bdfba9ebc 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -290,7 +290,7 @@ define([ [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.wsLock, _set.userProtected], undefined, undefined, undefined, '1', 'bottom', undefined, 'N'); Array.prototype.push.apply(this.lockedControls, this.btnsSortDown.concat(this.btnsSortUp, this.btnsSetAutofilter,this.btnsClearAutofilter)); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js index c2790027ec..9deb0ff5ac 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js @@ -402,7 +402,7 @@ define([ dataHintOffset: 'medium' }); this.lockedControls.push(this.btnShowFormulas); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index c38394fd4a..ff26ddfb06 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -359,7 +359,7 @@ define([ dataHintOffset: '-16, 0' }); this.lockedControls.push(this.pivotStyles); - + Common.UI.LayoutManager.addControls(this.btnsAddPivot.concat(this.lockedControls)); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 61370d25fc..cde85432a5 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -2239,7 +2239,7 @@ define([ cmp.setDisabled(true); }); this.lockToolbar(Common.enumLock.disableOnStart, true, {array: [me.btnPrint]}); - + Common.UI.LayoutManager.addControls(me.lockControls.concat([me.btnSave])); this.on('render:after', _.bind(this.onToolbarAfterRender, this)); } return this; @@ -2448,7 +2448,7 @@ define([ this.btnsEditHeader = Common.Utils.injectButtons($host.find('.slot-editheader'), 'tlbtn-editheader-', 'toolbar__icon btn-editheader', this.capBtnInsHeader, [Common.enumLock.editCell, Common.enumLock.selRangeEdit, Common.enumLock.headerLock, Common.enumLock.lostConnect, Common.enumLock.coAuth], undefined, undefined, undefined, '1', 'bottom', 'small'); Array.prototype.push.apply(this.lockControls, this.btnsEditHeader); - + Common.UI.LayoutManager.addControls(this.btnsEditHeader); this.btnPrint && this.btnPrint.menu && this.btnPrint.$el.addClass('split'); return $host; }, diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js index e74e509ee5..35f1670cc6 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js @@ -375,7 +375,7 @@ define([ dataHintOffset: 'small' }); this.lockedControls.push(this.chLeftMenu); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); }, diff --git a/apps/spreadsheeteditor/main/app/view/WBProtection.js b/apps/spreadsheeteditor/main/app/view/WBProtection.js index 23d8acc0f8..0d9945749f 100644 --- a/apps/spreadsheeteditor/main/app/view/WBProtection.js +++ b/apps/spreadsheeteditor/main/app/view/WBProtection.js @@ -200,7 +200,7 @@ define([ visible: !this.appConfig.isOffline }); this.lockedControls.push(this.btnProtectRange); - + Common.UI.LayoutManager.addControls(this.lockedControls); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); },