From 610a47ab7507e6b75d440554f9875ec139b3b1bf Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 20 Apr 2017 13:35:06 +0300 Subject: [PATCH] [DE] debug of compact mode --- apps/documenteditor/main/app/controller/Toolbar.js | 7 ++++--- apps/documenteditor/main/app/view/Toolbar.js | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 049857880..ad9452b47 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2748,10 +2748,11 @@ define([ } } - if ( !config.isEdit || - ( !Common.localStorage.itemExists("de-compact-toolbar") && - config.customization && config.customization.compactToolbar )) { + if ( config.isEdit && !Common.localStorage.itemExists("de-compact-toolbar") && + config.customization && config.customization.compactToolbar ) + { this.toolbar.setFolded(true); + this.toolbar.mnuitemCompactToolbar.setChecked(true, true); Common.NotificationCenter.trigger('layout:changed', 'toolbar'); Common.NotificationCenter.trigger('edit:complete', this.toolbar); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index a56ff4c59..ee281a24c 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1322,19 +1322,19 @@ define([ this.fireEvent('render:before', [this]); - if ( mode.isEdit ) - me.$el.html( me.rendererComponents(config.$dom) ); - else { - config.$dom.find('[data-tab=home],[data-tab=ins],[data-tab=layout]').hide(); + if ( mode.isEdit ) { + me.isCompactView = Common.localStorage.getBool("de-compact-toolbar"); + me.$el.html(me.rendererComponents(config.$dom)); + } else { + config.$dom.find('.canedit').hide(); config.$dom.addClass('folded'); + me.isCompactView = true; me.$el.html(config.$dom); } this.fireEvent('render:after', [this]); - me.isCompactView = Common.localStorage.getBool("de-compact-toolbar"); - /** coauthoring begin **/ this.showSynchTip = !Common.localStorage.getBool("de-hide-synch"); this.needShowSynchTip = false;