From 175cdd9fb5b6889ad44dc7e28b561b79670b37e4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Feb 2022 16:00:45 +0300 Subject: [PATCH] [DE] Remove settings button from header --- apps/common/main/lib/view/Header.js | 31 --- .../main/app/controller/LeftMenu.js | 1 - .../main/app/controller/Statusbar.js | 3 - .../main/app/controller/Toolbar.js | 1 - .../main/app/controller/ViewTab.js | 19 +- .../main/app/controller/Viewport.js | 193 ------------------ 6 files changed, 13 insertions(+), 235 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index a2e79aa39..fe594e90a 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -109,7 +109,6 @@ define([ '
' + '
' + '
' + - '
' + '' + '
' + '
' + @@ -337,9 +336,6 @@ define([ }); } } - - if ( me.btnOptions ) - me.btnOptions.updateHint(me.tipViewSettings); } function onFocusDocName(e){ @@ -397,9 +393,6 @@ define([ } } - function onContentThemeChangedToDark(isdark) { - } - return { options: { branding: {}, @@ -441,17 +434,6 @@ define([ reset : onResetUsers }); - me.btnOptions = new Common.UI.Button({ - cls: 'btn-header no-caret', - iconCls: 'toolbar__icon icon--inverse btn-ic-options', - menu: true, - dataHint: '0', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - me.mnuZoom = {options: {value: 100}}; - me.btnFavorite = new Common.UI.Button({ id: 'btn-favorite', cls: 'btn-header', @@ -466,7 +448,6 @@ define([ 'app:face': function(mode) {Common.Utils.asyncCall(onAppShowed, me, mode);} }); Common.NotificationCenter.on('collaboration:sharingdeny', onLostEditRights); - Common.NotificationCenter.on('contenttheme:dark', onContentThemeChangedToDark.bind(this)); Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this)); }, @@ -547,7 +528,6 @@ define([ if ( config.canEdit && config.canRequestEditRights ) this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big'); } - me.btnOptions.render($html.find('#slot-btn-options')); if (!config.isEdit || config.customization && !!config.customization.compactHeader) { if (config.user.guest && config.canRenameAnonymous) @@ -816,22 +796,11 @@ define([ switch ( alias ) { case 'undo': _lockButton(me.btnUndo); break; case 'redo': _lockButton(me.btnRedo); break; - case 'opts': _lockButton(me.btnOptions); break; default: break; } } }, - fakeMenuItem: function() { - return { - conf: {checked: false, disabled: false}, - setChecked: function (val) { this.conf.checked = val; }, - isChecked: function () { return this.conf.checked; }, - setDisabled: function (val) { this.conf.disabled = val; }, - isDisabled: function () { return this.conf.disabled; } - }; - }, - textBack: 'Go to Documents', txtRename: 'Rename', txtAccessRights: 'Change access rights', diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 270215f25..b8f6ab3ae 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -64,7 +64,6 @@ define([ 'hide': _.bind(this.onHideChat, this) }, 'Common.Views.Header': { - 'file:settings': _.bind(this.clickToolbarSettings,this), 'history:show': function () { if ( !this.leftMenu.panelHistory.isVisible() ) this.clickMenuFileItem('header', 'history'); diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 2418b501d..27ad9b07e 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -64,9 +64,6 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.statusbar); }.bind(this) }, - 'Common.Views.Header': { - 'statusbar:hide': _.bind(me.onChangeCompactView, me) - }, 'ViewTab': { 'statusbar:hide': _.bind(me.onChangeCompactView, me) } diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index fc305476b..39315b884 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -125,7 +125,6 @@ define([ 'menu:show': this.onFileMenu.bind(this, 'show') }, 'Common.Views.Header': { - 'toolbar:setcompact': this.onChangeCompactView.bind(this), 'print': function (opts) { var _main = this.getApplication().getController('Main'); _main.onPrint(); diff --git a/apps/documenteditor/main/app/controller/ViewTab.js b/apps/documenteditor/main/app/controller/ViewTab.js index c525fc980..7f138783d 100644 --- a/apps/documenteditor/main/app/controller/ViewTab.js +++ b/apps/documenteditor/main/app/controller/ViewTab.js @@ -88,6 +88,19 @@ define([ groupRulers.remove(); this.view.cmpEl.find('.separator-rulers').remove(); } + + if (!mode.isEdit) { // if view tab will be visible in view/restricted-editing mode + this.view.chToolbar.hide(); + var me = this; + Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){ + if ((action=='plugins' || action=='review' || action=='forms') && visible) { + me.view.chToolbar.show(); + } + }, this)); + + this.view.chRulers.hide(); + } + this.addListeners({ 'ViewTab': { 'zoom:topage': _.bind(this.onBtnZoomTo, this, 'topage'), @@ -104,11 +117,6 @@ define([ 'view:hide': _.bind(function (statusbar, state) { this.view.chStatusbar.setValue(!state, true); }, this) - }, - 'Common.Views.Header': { - 'rulers:hide': _.bind(function (isChecked) { - this.view.chRulers.setValue(!isChecked, true); - }, this) } }); }, @@ -229,7 +237,6 @@ define([ Common.localStorage.setBool('de-hidden-rulers', !checked); Common.Utils.InternalSettings.set("de-hidden-rulers", !checked); this.api.asc_SetViewRulers(checked); - this.view.fireEvent('rulers:hide', [!checked]); Common.NotificationCenter.trigger('layout:changed', 'rulers'); Common.NotificationCenter.trigger('edit:complete', this.view); }, diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index d8258c6e8..c1fae7b2b 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -80,7 +80,6 @@ define([ toolbar.setExtra('left', me.header.getPanel('left', config)); }, 'view:compact' : function (toolbar, state) { - me.header.mnuitemCompactToolbar.setChecked(state, true); me.viewport.vlayout.getItem('toolbar').height = state ? Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal'); }, @@ -105,21 +104,12 @@ define([ if ( me.header.btnSave ) me.header.btnSave.setDisabled(state); } - }, - 'ViewTab': { - 'rulers:hide': function (state) { - me.header.mnuitemHideRulers.setChecked(state, true); - }, - 'statusbar:hide': function (view, state) { - me.header.mnuitemHideStatusBar.setChecked(state, true); - } } }); }, setApi: function(api) { this.api = api; - this.api.asc_registerCallback('asc_onZoomChange', this.onApiZoomChange.bind(this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',this.onApiCoAuthoringDisconnect.bind(this)); Common.NotificationCenter.on('api:disconnect', this.onApiCoAuthoringDisconnect.bind(this)); }, @@ -156,13 +146,8 @@ define([ this.boxSdk = $('#editor_sdk'); this.boxSdk.css('border-left', 'none'); - this.header.mnuitemFitPage = this.header.fakeMenuItem(); - this.header.mnuitemFitWidth = this.header.fakeMenuItem(); - Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this)); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); - Common.NotificationCenter.on('uitheme:changed', this.onThemeChanged.bind(this)); - Common.NotificationCenter.on('contenttheme:dark', this.onContentThemeChangedToDark.bind(this)); }, onAppShowed: function (config) { @@ -213,131 +198,6 @@ define([ }, onAppReady: function (config) { - var me = this; - if ( me.header.btnOptions ) { - var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator); - if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator) { - if ( Common.localStorage.itemExists("de-compact-toolbar") ) { - compactview = Common.localStorage.getBool("de-compact-toolbar"); - } else - if ( config.customization && config.customization.compactToolbar ) - compactview = true; - } - - me.header.mnuitemCompactToolbar = new Common.UI.MenuItem({ - caption: me.header.textCompactView, - checked: compactview, - checkable: true, - value: 'toolbar' - }); - if (!config.isEdit) { - me.header.mnuitemCompactToolbar.hide(); - Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){ - if ((action=='plugins' || action=='review' || action=='forms') && visible) { - me.header.mnuitemCompactToolbar.show(); - } - }, this)); - } - - me.header.mnuitemHideStatusBar = new Common.UI.MenuItem({ - caption: me.header.textHideStatusBar, - checked: Common.localStorage.getBool("de-hidden-status"), - checkable: true, - value: 'statusbar' - }); - - if ( config.canBrandingExt && config.customization && config.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) - me.header.mnuitemHideStatusBar.hide(); - - me.header.mnuitemHideRulers = new Common.UI.MenuItem({ - caption: me.header.textHideLines, - checked: Common.Utils.InternalSettings.get("de-hidden-rulers"), - checkable: true, - value: 'rulers' - }); - if (!config.isEdit) - me.header.mnuitemHideRulers.hide(); - - me.header.menuItemsDarkMode = new Common.UI.MenuItem({ - caption: me.txtDarkMode, - checkable: true, - checked: Common.UI.Themes.isContentThemeDark(), - value: 'mode:dark' - }); - - me.header.mnuitemFitPage = new Common.UI.MenuItem({ - caption: me.textFitPage, - checkable: true, - checked: me.header.mnuitemFitPage.isChecked(), - value: 'zoom:page' - }); - - me.header.mnuitemFitWidth = new Common.UI.MenuItem({ - caption: me.textFitWidth, - checkable: true, - checked: me.header.mnuitemFitWidth.isChecked(), - value: 'zoom:width' - }); - - me.header.mnuZoom = new Common.UI.MenuItem({ - template: _.template([ - '' - ].join('')), - stopPropagation: true, - value: me.header.mnuZoom.options.value - }); - - me.header.btnOptions.setMenu(new Common.UI.Menu({ - cls: 'pull-right', - style: 'min-width: 180px;', - items: [ - me.header.mnuitemCompactToolbar, - me.header.mnuitemHideStatusBar, - me.header.mnuitemHideRulers, - {caption:'--'}, - me.header.menuItemsDarkMode, - {caption:'--'}, - me.header.mnuitemFitPage, - me.header.mnuitemFitWidth, - me.header.mnuZoom, - {caption:'--'}, - new Common.UI.MenuItem({ - caption: me.header.textAdvSettings, - value: 'advanced' - }) - ] - }) - ); - - var _on_btn_zoom = function (btn) { - btn == 'up' ? me.api.zoomIn() : me.api.zoomOut(); - Common.NotificationCenter.trigger('edit:complete', me.header); - }; - - (new Common.UI.Button({ - el : $('#hdr-menu-zoom-out', me.header.mnuZoom.$el), - cls : 'btn-toolbar' - })).on('click', _on_btn_zoom.bind(me, 'down')); - - (new Common.UI.Button({ - el : $('#hdr-menu-zoom-in', me.header.mnuZoom.$el), - cls : 'btn-toolbar' - })).on('click', _on_btn_zoom.bind(me, 'up')); - - me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this)); - if ( !Common.UI.Themes.isDarkTheme() ) { - me.header.menuItemsDarkMode.hide(); - me.header.menuItemsDarkMode.$el.prev('.divider').hide(); - } - } }, onLayoutChanged: function(area) { @@ -377,22 +237,6 @@ define([ this.api.Resize(); }, - onThemeChanged: function (id) { - if ( this.header.menuItemsDarkMode ) { - var current_dark = Common.UI.Themes.isDarkTheme(); - var menuItem = this.header.menuItemsDarkMode; - menuItem.setVisible(current_dark); - menuItem.$el.prev('.divider')[current_dark ? 'show' : 'hide'](); - - menuItem.setChecked(Common.UI.Themes.isContentThemeDark()); - } - }, - - onContentThemeChangedToDark: function (isdark) { - if ( this.header.menuItemsDarkMode ) - this.header.menuItemsDarkMode.setChecked(isdark, true); - }, - onWindowResize: function(e) { this.onLayoutChanged('window'); Common.NotificationCenter.trigger('window:resize'); @@ -404,46 +248,9 @@ define([ me.header.lockHeaderBtns( 'undo', _need_disable ); me.header.lockHeaderBtns( 'redo', _need_disable ); - me.header.lockHeaderBtns( 'opts', _need_disable ); me.header.lockHeaderBtns( 'users', _need_disable ); }, - onApiZoomChange: function(percent, type) { - this.header.mnuitemFitPage.setChecked(type == 2, true); - this.header.mnuitemFitWidth.setChecked(type == 1, true); - this.header.mnuZoom.options.value = percent; - - if ( this.header.mnuZoom.$el ) - $('.menu-zoom label.zoom', this.header.mnuZoom.$el).html(percent + '%'); - }, - - onOptionsItemClick: function (menu, item, e) { - var me = this; - - switch ( item.value ) { - case 'toolbar': me.header.fireEvent('toolbar:setcompact', [menu, item.isChecked()]); break; - case 'statusbar': me.header.fireEvent('statusbar:hide', [item, item.isChecked()]); break; - case 'rulers': - Common.localStorage.setBool('de-hidden-rulers', item.isChecked()); - Common.Utils.InternalSettings.set("de-hidden-rulers", item.isChecked()); - me.api.asc_SetViewRulers(!item.isChecked()); - Common.NotificationCenter.trigger('layout:changed', 'rulers'); - Common.NotificationCenter.trigger('edit:complete', me.header); - me.header.fireEvent('rulers:hide', [item.isChecked()]); - break; - case 'zoom:page': - item.isChecked() ? me.api.zoomFitToPage() : me.api.zoomCustomMode(); - Common.NotificationCenter.trigger('edit:complete', me.header); - break; - case 'zoom:width': - item.isChecked() ? me.api.zoomFitToWidth() : me.api.zoomCustomMode(); - Common.NotificationCenter.trigger('edit:complete', me.header); - break; - case 'advanced': me.header.fireEvent('file:settings', me.header); break; - case 'mode:dark': Common.UI.Themes.toggleContentTheme(); break; - } - }, - onApiCoAuthoringDisconnect: function(enableDownload) { if (this.header) { if (this.header.btnDownload && !enableDownload)