diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index f77b120b9..8cf6014d9 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -262,11 +262,11 @@ define([ var _left_bound_ = Math.round($boxTabs.offset().left), _right_bound_ = Math.round(_left_bound_ + $boxTabs.width()); - var tab = this.$tabs.first().get(0); + var tab = this.$tabs.filter(':first:visible').get(0); var rect = tab.getBoundingClientRect(); if ( !(Math.round(rect.left) < _left_bound_) ) { - tab = this.$tabs.last().get(0); + tab = this.$tabs.filter(':last:visible').get(0); rect = tab.getBoundingClientRect(); if (!(Math.round(rect.right) > _right_bound_)) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index fb62ef3b6..57b74b00c 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -366,7 +366,6 @@ define([ if ( !config.isEdit ) { if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline ) { this.btnDownload = new Common.UI.Button({ - id: 'btn-download', cls: 'btn-header', iconCls: 'svgicon svg-btn-download' }); @@ -376,7 +375,6 @@ define([ if ( config.canPrint ) { this.btnPrint = new Common.UI.Button({ - id: 'btn-goback', cls: 'btn-header', iconCls: 'svgicon svg-btn-print' }); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 5293c42c7..697f8b43f 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -933,7 +933,7 @@ define([ }); if ( me.isCompactView ) - me.setFolded(true); else + me.setFolded(true), me.collapse(); else me.setTab('home'); return this; diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 770fea8bd..daed79011 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -142,7 +142,7 @@ define([ action : 'opts', caption : this.btnSettingsCaption, canFocused: false - }) + }); this.items = []; this.items.push( diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index b6a70c293..5511c9bc9 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1279,7 +1279,7 @@ define([ }); if ( me.isCompactView ) - me.setFolded(true); else + me.setFolded(true), me.collapse(); else me.setTab('home'); return this;