diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index b445a8477..ec6ce90e5 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -610,7 +610,7 @@ define([ return false; }, - addDataHint: function (index) { //Hint Manager + addDataHint: function (index, dataHint) { //Hint Manager var oldHintTab = this.$bar.find('[data-hint]'); if (oldHintTab.length > 0) { oldHintTab.removeAttr('data-hint'); @@ -619,7 +619,7 @@ define([ oldHintTab.removeAttr('data-hint-title'); } var newHintTab = this.tabs[index].$el; - newHintTab.attr('data-hint', '0'); + newHintTab.attr('data-hint', dataHint || '0'); newHintTab.attr('data-hint-direction', 'top'); newHintTab.attr('data-hint-offset', 'medium'); newHintTab.attr('data-hint-title', 'M'); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 18d006074..90402d245 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1889,6 +1889,7 @@ define([ isObjLocked = false, commentsController = this.getApplication().getController('Common.Controllers.Comments'), internaleditor = this.permissions.isEditMailMerge || this.permissions.isEditDiagram || this.permissions.isEditOle, + diagramOrMergeEditor = this.permissions.isEditMailMerge || this.permissions.isEditDiagram, xfs = cellinfo.asc_getXfs(), isSmartArt = false, isSmartArtInternal = false; @@ -2146,14 +2147,14 @@ define([ documentHolder.pmiDeleteTable.setVisible(iscellmenu && !iscelledit && isintable); documentHolder.pmiSparklines.setVisible(isinsparkline); documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu) && !iscelledit && !inPivot); - documentHolder.pmiSortCells.menu.items[2].setVisible(!internaleditor); - documentHolder.pmiSortCells.menu.items[3].setVisible(!internaleditor); + documentHolder.pmiSortCells.menu.items[2].setVisible(!diagramOrMergeEditor); + documentHolder.pmiSortCells.menu.items[3].setVisible(!diagramOrMergeEditor); documentHolder.pmiSortCells.menu.items[4].setVisible(!internaleditor); - documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !internaleditor && !inPivot); - documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !internaleditor && !inPivot); - documentHolder.pmiCondFormat.setVisible(!iscelledit && !internaleditor); - documentHolder.mnuGroupPivot.setVisible(iscellmenu && !iscelledit && !internaleditor && inPivot); - documentHolder.mnuUnGroupPivot.setVisible(iscellmenu && !iscelledit && !internaleditor && inPivot); + documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !diagramOrMergeEditor && !inPivot); + documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !diagramOrMergeEditor && !inPivot); + documentHolder.pmiCondFormat.setVisible(!iscelledit && !diagramOrMergeEditor); + documentHolder.mnuGroupPivot.setVisible(iscellmenu && !iscelledit && !diagramOrMergeEditor && inPivot); + documentHolder.mnuUnGroupPivot.setVisible(iscellmenu && !iscelledit && !diagramOrMergeEditor && inPivot); documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||isinsparkline) && !iscelledit); documentHolder.pmiInsFunction.setVisible(iscellmenu && !iscelledit && !inPivot); documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit && !internaleditor); @@ -2171,8 +2172,8 @@ define([ } var hyperinfo = cellinfo.asc_getHyperlink(); - documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit && !ismultiselect && !internaleditor && !inPivot); - documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit && !ismultiselect && !internaleditor && !inPivot); + documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit && !ismultiselect && !diagramOrMergeEditor && !inPivot); + documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit && !ismultiselect && !diagramOrMergeEditor && !inPivot); documentHolder.pmiRowHeight.setVisible(isrowmenu||isallmenu); documentHolder.pmiColumnWidth.setVisible(iscolmenu||isallmenu); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 51f811314..a2f72abae 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -969,6 +969,8 @@ define([ me.updateThemeColors(); toolbarController.activateControls(); + } else if (me.appOptions.isEditOle) { + me.updateThemeColors(); } rightmenuController.createDelayedElements(); @@ -1389,8 +1391,8 @@ define([ var printController = app.getController('Print'); printController && this.api && printController.setApi(this.api); - - } + } else if (this.appOptions.isEditOle) + this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); var celleditorController = this.getApplication().getController('CellEditor'); celleditorController && celleditorController.setApi(this.api).setMode(this.appOptions); @@ -2454,11 +2456,11 @@ define([ updateThemeColors: function() { var me = this; - setTimeout(function(){ + !me.appOptions.isEditOle && setTimeout(function(){ me.getApplication().getController('RightMenu').UpdateThemeColors(); }, 50); - setTimeout(function(){ + !me.appOptions.isEditOle && setTimeout(function(){ me.getApplication().getController('Toolbar').updateThemeColors(); }, 50); @@ -2469,12 +2471,16 @@ define([ onSendThemeColors: function(colors, standart_colors) { Common.Utils.ThemeColor.setColors(colors, standart_colors); - if (window.styles_loaded && !this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram && !this.appOptions.isEditOle) { - this.updateThemeColors(); - var me = this; - setTimeout(function(){ - me.fillTextArt(); - }, 1); + if (window.styles_loaded) { + if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) + this.updateThemeColors(); + + if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram && !this.appOptions.isEditOle) { + var me = this; + setTimeout(function(){ + me.fillTextArt(); + }, 1); + } } }, diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 26f9610bf..19827c534 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -517,13 +517,13 @@ define([ // this.$el.find('.el-edit')[mode.isEdit?'show':'hide'](); //this.btnAddWorksheet.setVisible(this.mode.isEdit); $('#status-addtabs-box')[(this.mode.isEdit) ? 'show' : 'hide'](); - this.btnAddWorksheet.setVisible(!this.mode.isEditOle); 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.btnScrollFirst.$el.find('button').attr('data-hint', '1'); - this.btnScrollLast.$el.find('button').attr('data-hint', '1'); - this.btnScrollBack.$el.find('button').attr('data-hint', '1'); - this.btnScrollNext.$el.find('button').attr('data-hint', '1'); + 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'); this.cntSheetList.$el.find('button').removeAttr('data-hint-title'); // 'v' hint is used for paste this.cntZoom.$el.find('.dropdown-toggle').attr('data-hint', '1'); @@ -617,10 +617,10 @@ define([ this.tabbar.setTabVisible(sindex); this.btnAddWorksheet.setDisabled(me.mode.isDisconnected || me.api.asc_isWorkbookLocked() || wbprotected || me.api.isCellEdited); - if (this.mode.isEdit && !this.mode.isEditOle) { + if (this.mode.isEdit) { this.tabbar.addDataHint(_.findIndex(items, function (item) { return item.sheetindex === sindex; - })); + }), this.mode.isEditOle ? '1' : '0'); } $('#status-label-zoom').text(Common.Utils.String.format(this.zoomText, Math.floor((this.api.asc_getZoom() +.005)*100))); @@ -708,8 +708,8 @@ define([ this.tabbar.setTabVisible(index); } - if (this.mode.isEdit && !this.mode.isEditOle) { - this.tabbar.addDataHint(index); + if (this.mode.isEdit) { + this.tabbar.addDataHint(index, this.mode.isEditOle ? '1' : '0'); } this.fireEvent('sheet:changed', [this, tab.sheetindex]); @@ -720,7 +720,7 @@ define([ onTabMenu: function (o, index, tab, select) { var me = this; - if (this.mode.isEdit && !this.mode.isEditOle && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) && + if (this.mode.isEdit && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable) && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.PrintTitles) && !this.mode.isDisconnected ) { @@ -755,6 +755,7 @@ define([ this.tabMenu.items[7].setDisabled(select.length>1); this.tabMenu.items[8].setDisabled(issheetlocked || isdocprotected); + this.tabMenu.items[7].setVisible(!this.mode.isEditOle); this.tabMenu.items[7].setCaption(this.api.asc_isProtectedSheet() ? this.itemUnProtect : this.itemProtect); if (select.length === 1) { @@ -901,11 +902,11 @@ define([ }, changeViewMode: function (mode) { - var edit = mode.isEdit && !mode.isEditOle; + var edit = mode.isEdit; if (edit) { this.tabBarBox.css('left', '175px'); } else { - this.tabBarBox.css('left', mode.isEditOle ? '152px' : ''); + this.tabBarBox.css('left', ''); } this.tabbar.options.draggable = edit;