diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index e80da27eb..59c9c475d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1116,7 +1116,7 @@ define([ statusbarController.getView('Statusbar').changeViewMode(true); } - if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && !me.appOptions.isOffline) + if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && !me.appOptions.isDesktopApp && !me.appOptions.isOffline) application.getController('PivotTable').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api); var viewport = this.getApplication().getController('Viewport').getView('Viewport'); diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index de566376a..41378b537 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -200,7 +200,7 @@ define([ this._settings[settingsType].btn.updateHint(this.rightmenu.txtSparklineSettings); } - if (pivotInfo) { + if (pivotInfo && !this.rightmenu.mode.isDesktopApp) { settingsType = Common.Utils.documentSettingsType.Pivot; this._settings[settingsType].props = pivotInfo; this._settings[settingsType].locked = isPivotLocked; // disable pivot settings diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index acd2d0651..7ddf2f229 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3183,7 +3183,7 @@ define([ me.toolbar.itemsNamedRange = (namedRange && namedRange.menu && namedRange.menu.items) ? [namedRange.menu.items[0], namedRange.menu.items[1]] : []; Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons()); - if ( !config.isOffline ) { + if ( !config.isDesktopApp && !config.isOffline ) { tab = {action: 'pivot', caption: me.textPivot}; var pivottab = me.getApplication().getController('PivotTable'); $panel = pivottab.createToolbarPanel(); diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js index f252e0fd9..2f979a2df 100644 --- a/apps/spreadsheeteditor/main/app/view/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js @@ -131,6 +131,7 @@ define([ asctype: Common.Utils.documentSettingsType.Pivot, enableToggle: true, disabled: true, + visible: false, toggleGroup: 'tabpanelbtnsGroup', allowMouseEventsOnDisabled: true }); @@ -212,6 +213,9 @@ define([ this.signatureSettings = new SSE.Views.SignatureSettings(); } + if (mode && !mode.isDesktopApp) + this.btnPivot.setVisible(true); + if (_.isUndefined(this.scroller)) { this.scroller = new Common.UI.Scroller({ el: $(this.el).find('.right-panel'),