From 3e2782e12fff25d63a796eea088218ad76575c69 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 11 May 2022 19:55:52 +0300 Subject: [PATCH] [SSE] Remove First sheet and Last sheet buttons in statusbar --- apps/common/main/lib/component/TabBar.js | 4 +-- .../main/app/template/StatusBar.template | 2 -- .../main/app/view/Statusbar.js | 32 +++---------------- .../main/resources/less/statusbar.less | 4 +-- 4 files changed, 9 insertions(+), 33 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index ec6ce90e5..d7a16a04c 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -513,10 +513,10 @@ define([ }, setTabVisible: function(index, suppress) { - if (index <= 0 || index == 'first') { + if (index <= 0) { this.$bar.scrollLeft(0); this.checkInvisible(suppress); - } else if ( index >= (this.tabs.length - 1) || index == 'last') { + } else if ( index >= (this.tabs.length - 1)) { var tab = this.tabs[this.tabs.length-1].$el; if (this.$bar.find('.separator-item').length === 0) { this.$bar.append('
    • '); diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template index 780145617..68367459b 100644 --- a/apps/spreadsheeteditor/main/app/template/StatusBar.template +++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template @@ -1,10 +1,8 @@
    - -
    diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 332019482..431bb844c 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -60,10 +60,8 @@ define([ events: function() { return { - 'click #status-btn-tabfirst': _.bind(this.onBtnTabScroll, this, 'first'), 'click #status-btn-tabback': _.bind(this.onBtnTabScroll, this, 'backward'), - 'click #status-btn-tabnext': _.bind(this.onBtnTabScroll, this, 'forward'), - 'click #status-btn-tablast': _.bind(this.onBtnTabScroll, this, 'last') + 'click #status-btn-tabnext': _.bind(this.onBtnTabScroll, this, 'forward') }; }, @@ -100,13 +98,6 @@ define([ hintAnchor: 'top-right' }); - this.btnScrollFirst = new Common.UI.Button({ - el: $('#status-btn-tabfirst',this.el), - hint: this.tipFirst, - disabled: true, - hintAnchor: 'top' - }); - this.btnScrollBack = new Common.UI.Button({ el: $('#status-btn-tabback',this.el), hint: this.tipPrev, @@ -121,13 +112,6 @@ define([ hintAnchor: 'top' }); - this.btnScrollLast = new Common.UI.Button({ - el: $('#status-btn-tablast',this.el), - hint: this.tipLast, - disabled: true, - hintAnchor: 'top' - }); - this.btnAddWorksheet = new Common.UI.Button({ el: $('#status-btn-addtab',this.el), hint: this.tipAddTab, @@ -528,8 +512,6 @@ define([ this.btnAddWorksheet.setDisabled(this.mode.isDisconnected || this.api && (this.api.asc_isWorkbookLocked() || this.api.isCellEdited) || this.rangeSelectionMode!=Asc.c_oAscSelectionDialogType.None); if (this.mode.isEditOle) { // change hints order this.btnAddWorksheet.$el.find('button').addBack().filter('button').attr('data-hint', '1'); - this.btnScrollFirst.$el.find('button').addBack().filter('button').attr('data-hint', '1'); - this.btnScrollLast.$el.find('button').addBack().filter('button').attr('data-hint', '1'); this.btnScrollBack.$el.find('button').addBack().filter('button').attr('data-hint', '1'); this.btnScrollNext.$el.find('button').addBack().filter('button').attr('data-hint', '1'); this.cntSheetList.$el.find('button').attr('data-hint', '1'); @@ -825,13 +807,11 @@ define([ }, onTabInvisible: function(obj, opts) { - if (this.btnScrollFirst.isDisabled() !== (!opts.first)) { - this.btnScrollFirst.setDisabled(!opts.first); + if (this.btnScrollBack.isDisabled() !== (!opts.first)) { this.btnScrollBack.setDisabled(!opts.first); } if (this.btnScrollNext.isDisabled() !== (!opts.last)) { this.btnScrollNext.setDisabled(!opts.last); - this.btnScrollLast.setDisabled(!opts.last); } this.hasTabInvisible = opts.first || opts.last; }, @@ -858,8 +838,8 @@ define([ if (this.boxAction.is(':visible')) { var tabsWidth = this.tabbar.getWidth(); var actionWidth = this.actionWidth || 140; - if (Common.Utils.innerWidth() - right - 175 - actionWidth - tabsWidth > 0) { // docWidth - right - left - this.boxAction.width - var left = tabsWidth + 175; + if (Common.Utils.innerWidth() - right - 129 - actionWidth - tabsWidth > 0) { // docWidth - right - left - this.boxAction.width + var left = tabsWidth + 129; this.boxAction.css({'right': right + 'px', 'left': left + 'px', 'width': 'auto'}); this.boxAction.find('.separator').css('border-left-color', 'transparent'); } else { @@ -912,7 +892,7 @@ define([ changeViewMode: function (mode) { var edit = mode.isEdit; if (edit) { - this.tabBarBox.css('left', '175px'); + this.tabBarBox.css('left', '129px'); } else { this.tabBarBox.css('left', ''); } @@ -1043,8 +1023,6 @@ define([ tipZoomIn : 'Zoom In', tipZoomOut : 'Zoom Out', tipZoomFactor : 'Magnification', - tipFirst : 'First Sheet', - tipLast : 'Last Sheet', tipPrev : 'Previous Sheet', tipNext : 'Next Sheet', tipAddTab : 'Add Worksheet', diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 44bf51149..aac5953a4 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -3,7 +3,7 @@ z-index: 500; #status-tabs-scroll { - width: 112px; + width: 66px; float: left; padding: 3px 12px 0 10px; height: 25px; @@ -159,7 +159,7 @@ position: absolute; overflow: hidden; height: 25px; - left: 112px; + left: 66px; right: 160px; //margin-right: 3px; }