From 7d4088ecb808f29256f2ce2b68554f24776747b8 Mon Sep 17 00:00:00 2001 From: nikita_bartoshuk Date: Thu, 29 May 2025 15:05:51 +0300 Subject: [PATCH] fix: remove slidemaster from toolbar --- .../main/app/controller/SlideMasterTab.js | 35 +--- .../main/app/controller/Toolbar.js | 125 +------------ .../main/app/template/Toolbar.template | 20 -- .../main/app/view/SlideMasterTab.js | 63 +++---- .../main/app/view/Toolbar.js | 174 ------------------ .../main/app/view/ViewTab.js | 2 +- 6 files changed, 43 insertions(+), 376 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/SlideMasterTab.js b/apps/presentationeditor/main/app/controller/SlideMasterTab.js index c7ec4c5f63..5045dd77d5 100644 --- a/apps/presentationeditor/main/app/controller/SlideMasterTab.js +++ b/apps/presentationeditor/main/app/controller/SlideMasterTab.js @@ -31,9 +31,9 @@ */ /** - * ViewTab.js + * SlideMasterTab.js * - * Created on 07.12.2021 + * Created on 01.06.2025 * */ @@ -56,30 +56,13 @@ define([ var me = this; this.checkInsertAutoshape = function(e) { - console.log('check inster autoshape') var cmp = $(e.target), - cmp_sdk = cmp.closest('#editor_sdk'), - btn_id = cmp.closest('button').attr('id'); - if (btn_id===undefined) - btn_id = cmp.closest('.btn-group').attr('id'); - if (btn_id===undefined) - btn_id = cmp.closest('.combo-dataview').attr('id'); - - if (cmp.attr('id') != 'editor_sdk' && cmp_sdk.length<=0) { - if ( me.toolbar.btnsInsertText && me.toolbar.btnsInsertText.pressed() && !me.toolbar.btnsInsertText.contains(btn_id) || - me.toolbar.cmbsInsertShape && me.toolbar.cmbsInsertShape.some(function(cmb) { - return cmb.isComboViewRecActive() && cmb.id !== btn_id; - }) || - me.toolbar.btnInsertPlaceholder && me.toolbar.btnInsertPlaceholder.pressed && me.toolbar.btnInsertPlaceholder.id !== btn_id) - { + cmp_sdk = cmp.closest('#editor_sdk'); + if (cmp.attr('id') !== 'editor_sdk' && cmp_sdk.length <= 0) { + if (me.view.btnInsertPlaceholder && me.view.btnInsertPlaceholder.pressed) { me._isAddingShape = false; - - me.toolbar.btnsInsertText && me.toolbar.btnsInsertText.toggle(false, true); - me.toolbar.cmbsInsertShape && me.toolbar.cmbsInsertShape.forEach(function(cmb) { - cmb.deactivateRecords(); - }); - me.toolbar.btnInsertPlaceholder && me.toolbar.btnInsertPlaceholder.toggle(false, true); - Common.NotificationCenter.trigger('edit:complete', this.view); + me.view.btnInsertPlaceholder.toggle(false, true); + Common.NotificationCenter.trigger('edit:complete', me.view); } } }; @@ -136,7 +119,7 @@ define([ in_slide_master = pr.get_IsMasterSelected(); } } - this.toolbar.toolbar.lockToolbar(Common.enumLock.inSlideMaster, in_slide_master, { + Common.Utils.lockControls(Common.enumLock.inSlideMaster, in_slide_master, { array: [ this.view.btnInsertPlaceholder, this.view.chTitle, @@ -272,7 +255,7 @@ define([ this._addPlaceHolder(btn.pressed, value, isVertical); - Common.NotificationCenter.trigger('edit:complete', this.toolbar); + Common.NotificationCenter.trigger('edit:complete', this.view); Common.component.Analytics.trackEvent('SlideMasterTab', 'Add Placeholder'); }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 9895d194b4..593abb5cb5 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -135,12 +135,6 @@ define([ 'insert:smartart' : this.onInsertSmartArt, 'smartart:mouseenter': this.mouseenterSmartArt, 'smartart:mouseleave': this.mouseleaveSmartArt, - 'insert:slide-master': this.onInsertSlideMaster.bind(this), - 'insert:layout' : this.onInsertLayout.bind(this), - 'insert:placeholder-btn': this.onBtnInsertPlaceholder.bind(this), - 'insert:placeholder-menu': this.onMenuInsertPlaceholder.bind(this), - 'title:hide' : this.onTitleHide.bind(this), - 'footers:hide' : this.onFootersHide.bind(this), 'tab:active' : this.onActiveTab.bind(this), 'tab:collapse' : this.onTabCollapse.bind(this) }, @@ -225,8 +219,7 @@ define([ if ( me.toolbar.btnsInsertText.pressed() && !me.toolbar.btnsInsertText.contains(btn_id) || me.toolbar.cmbsInsertShape.some(function(cmb) { return cmb.isComboViewRecActive() && cmb.id !== btn_id; - }) || - me.toolbar.btnInsertPlaceholder.pressed && me.toolbar.btnInsertPlaceholder.id !== btn_id) + })) { me._isAddingShape = false; @@ -235,7 +228,6 @@ define([ me.toolbar.cmbsInsertShape.forEach(function(cmb) { cmb.deactivateRecords(); }); - me.toolbar.btnInsertPlaceholder.toggle(false, true); Common.NotificationCenter.trigger('edit:complete', me.toolbar); } } @@ -256,9 +248,6 @@ define([ cmb.deactivateRecords(); }); - if (this.toolbar.btnInsertPlaceholder.pressed) - this.toolbar.btnInsertPlaceholder.toggle(false, true); - $(document.body).off('mouseup', checkInsertAutoshape); }; @@ -273,18 +262,6 @@ define([ } } }; - - this._addPlaceHolder = function (isstart, type, isVertical) { - if (this.api) { - if (isstart) { - this.api.asc_StartAddPlaceholder(type, isVertical, true); - $(document.body).on('mouseup', checkInsertAutoshape); - } else { - this.api.asc_StartAddPlaceholder('', undefined, false); - $(document.body).off('mouseup', checkInsertAutoshape); - } - } - } }, onLaunch: function() { @@ -482,8 +459,6 @@ define([ this.api.asc_registerCallback('asc_onLockSlideHdrFtrApplyToAll', _.bind(this.onApiLockSlideHdrFtrApplyToAll, this, true)); this.api.asc_registerCallback('asc_onUnLockSlideHdrFtrApplyToAll', _.bind(this.onApiLockSlideHdrFtrApplyToAll, this, false)); - this.api.asc_registerCallback('asc_onLayoutTitle', _.bind(this.onApiLayoutTitle, this)); - this.api.asc_registerCallback('asc_onLayoutFooter', _.bind(this.onApiLayoutFooter, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this)); } @@ -999,11 +974,6 @@ define([ this.toolbar.mnuArrangeBackward.setDisabled(in_smartart_internal); } - if (this._state.in_slide_master !== in_slide_master) { - this.toolbar.lockToolbar(Common.enumLock.inSlideMaster, in_slide_master, {array: [me.toolbar.btnInsertPlaceholder, me.toolbar.chTitle, me.toolbar.chFooters]}); - this._state.in_slide_master = in_slide_master; - } - if (!this.toolbar.btnShapesMerge.isDisabled() && this.toolbar.isTabActive('home')) Common.UI.TooltipManager.showTip('mergeShapes'); }, @@ -2846,6 +2816,7 @@ define([ me.toolbar.setVisible('slideMaster', !visible); !editmode && !compactview && visible && Common.Utils.InternalSettings.set('toolbar-active-tab', 'view'); // need to activate later } + config.isEdit && Array.prototype.push.apply(me.toolbar.lockControls, slideMasterTab.getView('SlideMasterTab').getButtons()); }, onAppReady: function (config) { @@ -3046,7 +3017,7 @@ define([ this.toolbar.setTab('slideMaster'); } else { Common.NotificationCenter.trigger('tab:visible', 'slideMaster', false); - this.toolbar.setTab('view'); + this.toolbar.setTab('home'); this.showStaticElements(); } @@ -3054,96 +3025,6 @@ define([ Common.NotificationCenter.trigger('tab:visible', 'animate', !isMaster); }, - onInsertSlideMaster: function () { - this.api.asc_AddMasterSlide(); - }, - - onInsertLayout: function () { - this.api.asc_AddSlideLayout(); - }, - - onBtnInsertPlaceholder: function (btn, e) { - btn.menu.getItems(true).forEach(function(item) { - if(item.value == btn.options.currentType) - item.setChecked(true); - }); - if(!btn.pressed) { - btn.menu.clearAll(true); - } - this.onInsertPlaceholder(btn.options.currentType, btn, e); - }, - - onMenuInsertPlaceholder: function (btn, e) { - var oldType = btn.options.currentType; - var newType = e.value; - - if(newType != oldType){ - btn.updateHint([e.options.hintForMainBtn, this.views.Toolbar.prototype.tipInsertPlaceholder]); - btn.changeIcon({ - next: e.options.iconClsForMainBtn, - curr: btn.menu.getItems(true).filter(function(item){return item.value == oldType})[0].options.iconClsForMainBtn - }); - btn.options.currentType = newType; - } - this.onInsertPlaceholder(newType, btn, e); - }, - - onInsertPlaceholder: function (type, btn, e) { - var value, - isVertical; - switch (type) { - case 1: - value = null; - break; - case 2: - value = null; - isVertical = true; - break; - case 3: - value = AscFormat.phType_body; - break; - case 4: - value = AscFormat.phType_body; - isVertical = true; - break; - case 5: - value = AscFormat.phType_pic; - break; - case 6: - value = AscFormat.phType_chart; - break; - case 7: - value = AscFormat.phType_tbl; - break; - case 8: - value = AscFormat.phType_dgm; - break; - } - - this._addPlaceHolder(btn.pressed, value, isVertical); - - Common.NotificationCenter.trigger('edit:complete', this.toolbar); - Common.component.Analytics.trackEvent('ToolBar', 'Add Placeholder'); - }, - - onTitleHide: function (view, status) { - this.api.asc_setLayoutTitle(status); - }, - - onFootersHide: function (view, status) { - this.api.asc_setLayoutFooter(status); - }, - - onApiLayoutTitle: function (status) { - if ((this.toolbar.chTitle.getValue() === 'checked') !== status) - this.toolbar.chTitle.setValue(status, true); - }, - - onApiLayoutFooter: function (status) { - if ((this.toolbar.chFooters.getValue() === 'checked') !== status) - this.toolbar.chFooters.setValue(status, true); - }, - onActiveTab: function(tab) { if (tab !== 'home') { Common.UI.TooltipManager.closeTip('tabDesign'); diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index 8f7ebc4fc6..40c5004145 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -46,11 +46,6 @@ - -
@@ -117,21 +112,6 @@
- - - -
diff --git a/apps/presentationeditor/main/app/view/SlideMasterTab.js b/apps/presentationeditor/main/app/view/SlideMasterTab.js index 6476585cef..252baf95bf 100644 --- a/apps/presentationeditor/main/app/view/SlideMasterTab.js +++ b/apps/presentationeditor/main/app/view/SlideMasterTab.js @@ -30,9 +30,9 @@ * */ /** - * ViewTab.js + * SlideMasterTab.js * - * Created on 07.12.2021 + * Created on 01.06.2025 * */ @@ -46,7 +46,7 @@ define([ PE.Views.SlideMasterTab = Common.UI.BaseView.extend(_.extend((function(){ var template = '
' + - '
' + + '
' + '' + '' + '
' + @@ -65,7 +65,6 @@ define([ '
' + '' + '
' + - '
' + '
'; return { options: {}, @@ -122,7 +121,6 @@ define([ dataHintDirection: 'bottom', dataHintOffset: 'small' }).on('click', function (btn, e) { - console.log(_set) this.fireEvent('insert:slide-master', [btn, e]); }.bind(this)); this.slideOnlyControls.push(this.btnAddSlideMaster); @@ -315,33 +313,32 @@ define([ }, 10); }, - capAddSlideMaster: 'Add Slide Master', - tipAddSlideMaster: 'Add slide master', - capAddLayout: 'Add Layout', - tipAddLayout: 'Add layout', - textTitle: 'Title', - textFooters: 'Footers', - textContent: 'Content', - textContentVertical: 'Content (Vertical)', - textText: 'Text', - textTextVertical: 'Text (Vertical)', - textPicture: 'Picture', - textChart: 'Chart', - textTable: 'Table', - textSmartArt: 'SmartArt', - capCloseMaster: 'Close Master', - tipCloseMaster: 'Close master', - capInsertPlaceholder: 'Insert Placeholder', - tipInsertPlaceholder: 'Insert placeholder', - tipInsertContentPlaceholder: 'Insert content placeholder', - tipInsertContentVerticalPlaceholder: 'Insert content (vertical) placeholder', - tipInsertTextPlaceholder: 'Insert text placeholder', - tipInsertTextVerticalPlaceholder: 'Insert text (vertical) placeholder', - tipInsertPicturePlaceholder: 'Insert picture placeholder', - tipInsertChartPlaceholder: 'Insert chart placeholder', - tipInsertTablePlaceholder: 'Insert table placeholder', - tipInsertSmartArtPlaceholder: 'Insert SmartArt placeholder', - textTabStyle: 'Tab style', + // capAddSlideMaster: 'Add Slide Master', + // tipAddSlideMaster: 'Add slide master', + // capAddLayout: 'Add Layout', + // tipAddLayout: 'Add layout', + // textTitle: 'Title', + // textFooters: 'Footers', + // textContent: 'Content', + // textContentVertical: 'Content (Vertical)', + // textText: 'Text', + // textTextVertical: 'Text (Vertical)', + // textPicture: 'Picture', + // textChart: 'Chart', + // textTable: 'Table', + // textSmartArt: 'SmartArt', + // capCloseMaster: 'Close Master', + // tipCloseMaster: 'Close master', + // capInsertPlaceholder: 'Insert Placeholder', + // tipInsertPlaceholder: 'Insert placeholder', + // tipInsertContentPlaceholder: 'Insert content placeholder', + // tipInsertContentVerticalPlaceholder: 'Insert content (vertical) placeholder', + // tipInsertTextPlaceholder: 'Insert text placeholder', + // tipInsertTextVerticalPlaceholder: 'Insert text (vertical) placeholder', + // tipInsertPicturePlaceholder: 'Insert picture placeholder', + // tipInsertChartPlaceholder: 'Insert chart placeholder', + // tipInsertTablePlaceholder: 'Insert table placeholder', + // tipInsertSmartArtPlaceholder: 'Insert SmartArt placeholder', } }()), PE.Views.SlideMasterTab || {})); -}); +}); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 882e8b3f08..ffdbc3cf14 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -277,36 +277,6 @@ define([ me.slideOnlyControls.push(me.btnAddSlide); me.lockControls.push(me.btnAddSlide); - me.btnAddSlideMaster = new Common.UI.Button({ - id: 'id-toolbar-btn-add-slide-master', - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-add-slide-master', - caption: this.capAddSlideMaster, - lock: [_set.menuFileOpen, _set.lostConnect, _set.disableOnStart], - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'small' - }).on('click', function (btn, e) { - me.fireEvent('insert:slide-master', [btn, e]); - }); - me.slideOnlyControls.push(me.btnAddSlideMaster); - me.lockControls.push(me.btnAddSlideMaster); - - me.btnAddLayout = new Common.UI.Button({ - id: 'id-toolbar-btn-add-layout', - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-add-layout', - caption: this.capAddLayout, - lock: [_set.menuFileOpen, _set.lostConnect, _set.disableOnStart], - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'small' - }).on('click', function (btn, e) { - me.fireEvent('insert:layout', [btn, e]); - }); - me.slideOnlyControls.push(me.btnAddLayout); - me.lockControls.push(me.btnAddLayout); - me.btnChangeSlide = new Common.UI.Button({ id: 'id-toolbar-button-change-slide', cls: 'btn-toolbar', @@ -825,57 +795,6 @@ define([ me.paragraphControls.push(me.btnColumns); me.lockControls.push(me.btnColumns); - me.btnInsertPlaceholder = new Common.UI.Button({ - id: 'tlbtn-insertplaceholder', - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-ins-content-placeholder', - caption: me.capInsertPlaceholder, - lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart, _set.inSlideMaster], - menu: true, - split: true, - action: 'insert-placeholder', - enableToggle: true, - currentType: 1, - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'small' - }); - me.slideOnlyControls.push(me.btnInsertPlaceholder); - me.lockControls.push(me.btnInsertPlaceholder); - - this.chTitle = new Common.UI.CheckBox({ - lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart, _set.inSlideMaster], - labelText: this.textTitle, - dataHint : '1', - dataHintDirection: 'left', - dataHintOffset: 'small' - }); - this.slideOnlyControls.push(this.chTitle); - this.lockControls.push(this.chTitle); - - this.chFooters = new Common.UI.CheckBox({ - lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart, _set.inSlideMaster], - labelText: this.textFooters, - dataHint : '1', - dataHintDirection: 'left', - dataHintOffset: 'small' - }); - this.slideOnlyControls.push(this.chFooters); - this.lockControls.push(this.chFooters); - - me.btnCloseSlideMaster = new Common.UI.Button({ - id: 'tlbtn-close-slide-master', - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-close-master', - lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], - caption: me.capCloseMaster, - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'small' - }); - me.slideOnlyControls.push(me.btnCloseSlideMaster); - me.lockControls.push(me.btnCloseSlideMaster); - me.btnInsertTable = new Common.UI.Button({ id: 'tlbtn-inserttable', cls: 'btn-toolbar x-huge icon-top', @@ -1463,8 +1382,6 @@ define([ _injectComponent('#slot-btn-paste', this.btnPaste); _injectComponent('#slot-btn-cut', this.btnCut); _injectComponent('#slot-addslide', this.btnAddSlide); - _injectComponent('#slot-addslidemaster', this.btnAddSlideMaster); - _injectComponent('#slot-addlayout', this.btnAddLayout); _injectComponent('#slot-changeslide', this.btnChangeSlide); _injectComponent('#slot-preview', this.btnPreview); _injectComponent('#slot-btn-select-all', this.btnSelectAll); @@ -1506,10 +1423,6 @@ define([ _injectComponent('#slot-btn-editheader', this.btnEditHeader); _injectComponent('#slot-btn-datetime', this.btnInsDateTime); _injectComponent('#slot-btn-slidenum', this.btnInsSlideNum); - _injectComponent('#slot-btn-insplaceholder', this.btnInsertPlaceholder); - _injectComponent('#slot-chk-title', this.chTitle); - _injectComponent('#slot-chk-footers', this.chFooters); - _injectComponent('#slot-btn-closeslidemaster', this.btnCloseSlideMaster); this.cmbsInsertShape = []; $host.find('.slot-combo-insertshape').each(function (index, el) { @@ -1685,8 +1598,6 @@ define([ this.btnPaste.updateHint(this.tipPaste + Common.Utils.String.platformKey('Ctrl+V')); this.btnCut.updateHint(this.tipCut + Common.Utils.String.platformKey('Ctrl+X')); this.btnAddSlide.updateHint(this.tipAddSlide + Common.Utils.String.platformKey('Ctrl+M')); - this.btnAddSlideMaster.updateHint(this.tipAddSlideMaster); - this.btnAddLayout.updateHint(this.tipAddLayout); this.btnChangeSlide.updateHint(this.tipChangeSlide); this.btnPreview.updateHint(this.tipPreview); this.btnSelectAll.updateHint(this.tipSelectAll + Common.Utils.String.platformKey('Ctrl+A')); @@ -1712,7 +1623,6 @@ define([ this.btnIncLeftOffset.updateHint(this.tipIncPrLeft); this.btnLineSpace.updateHint(this.tipLineSpace); this.btnColumns.updateHint(this.tipColumns); - this.btnInsertPlaceholder.updateHint(this.tipInsertContentPlaceholder); this.btnInsertTable.updateHint(this.tipInsertTable); this.btnInsertChart.updateHint(this.tipInsertChart); this.btnInsertSmartArt.updateHint(this.tipInsertSmartArt); @@ -1730,7 +1640,6 @@ define([ this.btnEditHeader.updateHint(this.tipEditHeaderFooter); this.btnInsDateTime.updateHint(this.tipDateTime); this.btnInsSlideNum.updateHint(this.tipSlideNum); - this.btnCloseSlideMaster.updateHint(this.tipCloseMaster); // set menus @@ -2006,89 +1915,6 @@ define([ maxColumns: 10 }); - this.btnInsertPlaceholder.setMenu( - new Common.UI.Menu({ - cls: 'menu-insert-placeholder', - items: [ - new Common.UI.MenuItem({ - caption: me.textContent, - iconCls: 'icon toolbar__icon btn-ins-content-placeholder', - iconClsForMainBtn: 'btn-ins-content-placeholder', - hintForMainBtn: me.tipInsertContentPlaceholder, - value: 1 - }), - new Common.UI.MenuItem({ - caption: me.textContentVertical, - iconCls: 'icon toolbar__icon btn-ins-vertical-content-placeholder', - iconClsForMainBtn: 'btn-ins-vertical-content-placeholder', - hintForMainBtn: me.tipInsertContentVerticalPlaceholder, - value: 2 - }), - new Common.UI.MenuItem({ - caption: me.textText, - iconCls: 'icon toolbar__icon btn-ins-text-placeholder', - iconClsForMainBtn: 'btn-ins-text-placeholder', - hintForMainBtn: me.tipInsertTextPlaceholder, - value: 3 - }), - new Common.UI.MenuItem({ - caption: me.textTextVertical, - iconCls: 'icon toolbar__icon btn-ins-vertical-text-placeholder', - iconClsForMainBtn: 'btn-ins-vertical-text-placeholder', - hintForMainBtn: me.tipInsertTextVerticalPlaceholder, - value: 4 - }), - new Common.UI.MenuItem({ - caption: me.textPicture, - iconCls: 'icon toolbar__icon btn-ins-picture-placeholder', - iconClsForMainBtn: 'btn-ins-picture-placeholder', - hintForMainBtn: me.tipInsertPicturePlaceholder, - value: 5 - }), - new Common.UI.MenuItem({ - caption: me.textChart, - iconCls: 'icon toolbar__icon btn-ins-chart-placeholder', - iconClsForMainBtn: 'btn-ins-chart-placeholder', - hintForMainBtn: me.tipInsertChartPlaceholder, - value: 6 - }), - new Common.UI.MenuItem({ - caption: me.textTable, - iconCls: 'icon toolbar__icon btn-ins-table-placeholder', - iconClsForMainBtn: 'btn-ins-table-placeholder', - hintForMainBtn: me.tipInsertTablePlaceholder, - value: 7 - }), - new Common.UI.MenuItem({ - caption: me.textSmartArt, - iconCls: 'icon toolbar__icon btn-ins-smartart-placeholder', - iconClsForMainBtn: 'btn-ins-smartart-placeholder', - hintForMainBtn: me.tipInsertSmartArtPlaceholder, - value: 8 - }) - ] - }).on('item:click', function (btn, e) { - me.btnInsertPlaceholder.toggle(true); - me.fireEvent('insert:placeholder-menu', [me.btnInsertPlaceholder, e]); - }) - ); - - me.btnInsertPlaceholder.on('click', function (btn, e) { - me.fireEvent('insert:placeholder-btn', [btn, e]); - }); - - me.chTitle.on('change', _.bind(function (checkbox, state) { - me.fireEvent('title:hide', [me.chTitle, state === 'checked']); - }, me)); - - me.chFooters.on('change', _.bind(function (checkbox, state) { - me.fireEvent('footers:hide', [me.chFooters, state === 'checked']); - }, me)); - - me.btnCloseSlideMaster.on('click', function (btn, e) { - me.fireEvent('close:slide-master', [btn, e]); - }); - /** coauthoring begin **/ this.showSynchTip = !Common.localStorage.getBool('pe-hide-synch'); diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js index 273c289edb..fdffcde8e3 100644 --- a/apps/presentationeditor/main/app/view/ViewTab.js +++ b/apps/presentationeditor/main/app/view/ViewTab.js @@ -46,7 +46,7 @@ define([ PE.Views.ViewTab = Common.UI.BaseView.extend(_.extend((function(){ var template = '
' + - '
' + + '
' + '' + '' + '
' +