diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index b033053193..394515c3c3 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1709,7 +1709,7 @@ define([ } Common.Utils.InternalSettings.set("settings-tab-style", value || 'tab'); value = Common.UI.FeaturesManager.getInitValue('tabBackground', true); - if (Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("de-settings-tab-background")) { // get from local storage + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("de-settings-tab-background")) { // get from local storage value = Common.localStorage.getItem("de-settings-tab-background"); } else if (value === undefined && this.editorConfig.customization && (typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.toolbarNoTabs) { value = 'toolbar'; diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 128dcb9f1b..c2224fa5ad 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -281,7 +281,7 @@ define([ // Common.Utils.InternalSettings.set("de-settings-quick-print-button", value); // if (this.header && this.header.btnPrintQuick) // this.header.btnPrintQuick[value ? 'show' : 'hide'](); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { this.onTabBackgroundChange(); this.header.changeLogo(); } diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 69029423e9..94ab49769e 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -914,7 +914,7 @@ define([ if ( !Common.UI.Themes.available() ) { $('tr.themes, tr.themes + tr.divider', this.el).hide(); } - $('tr.tab-background', this.el)[Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); + $('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); if (mode.compactHeader) { $('tr.quick-access', this.el).hide(); } @@ -1066,7 +1066,7 @@ define([ //Common.localStorage.setBool("de-settings-quick-print-button", this.chQuickPrint.isChecked()); // Common.localStorage.setBool("de-settings-compact-header", this.chCompactHeader.isChecked()); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { Common.localStorage.setItem("de-settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); Common.Utils.InternalSettings.set("settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); } diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index 22f126d356..244db9f220 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -1305,7 +1305,7 @@ define([ } Common.Utils.InternalSettings.set("settings-tab-style", value || 'tab'); value = Common.UI.FeaturesManager.getInitValue('tabBackground', true); - if (Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("pdfe-settings-tab-background")) { // get from local storage + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("pdfe-settings-tab-background")) { // get from local storage value = Common.localStorage.getItem("pdfe-settings-tab-background"); } else if (value === undefined && this.editorConfig.customization && (typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.toolbarNoTabs) { value = 'toolbar'; diff --git a/apps/pdfeditor/main/app/controller/Viewport.js b/apps/pdfeditor/main/app/controller/Viewport.js index d99a8f9a7e..1dbfb7a04e 100644 --- a/apps/pdfeditor/main/app/controller/Viewport.js +++ b/apps/pdfeditor/main/app/controller/Viewport.js @@ -260,7 +260,7 @@ define([ // Common.Utils.InternalSettings.set("pdfe-settings-quick-print-button", value); // if (this.header && this.header.btnPrintQuick) // this.header.btnPrintQuick[value ? 'show' : 'hide'](); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { this.onTabBackgroundChange(); this.header.changeLogo(); } diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js index 5749380f83..17097573e1 100644 --- a/apps/pdfeditor/main/app/view/FileMenuPanels.js +++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js @@ -715,7 +715,7 @@ define([ $('tr.comments', this.el)[mode.canCoAuthoring && !mode.isForm ? 'show' : 'hide'](); $('tr.ui-rtl', this.el)[mode.uiRtl ? 'show' : 'hide'](); /** coauthoring end **/ - $('tr.tab-background', this.el)[Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); + $('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide'](); if ( !Common.UI.Themes.available() ) { $('tr.themes, tr.themes + tr.divider', this.el).hide(); @@ -823,7 +823,7 @@ define([ var isRtlChanged = this.chRTL.$el.is(':visible') && Common.localStorage.getBool("ui-rtl", Common.Locale.isCurrentLanguageRtl()) !== this.chRTL.isChecked(); Common.localStorage.setBool("ui-rtl", this.chRTL.isChecked()); //Common.localStorage.setBool("pdfe-settings-quick-print-button", this.chQuickPrint.isChecked()); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { Common.localStorage.setItem("pdfe-settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); Common.Utils.InternalSettings.set("settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); } diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 1c896f014b..d4c64bb146 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1333,7 +1333,7 @@ define([ } Common.Utils.InternalSettings.set("settings-tab-style", value || 'tab'); value = Common.UI.FeaturesManager.getInitValue('tabBackground', true); - if (Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("pe-settings-tab-background")) { // get from local storage + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("pe-settings-tab-background")) { // get from local storage value = Common.localStorage.getItem("pe-settings-tab-background"); } else if (value === undefined && this.editorConfig.customization && (typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.toolbarNoTabs) { value = 'toolbar'; diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 26d1ad2ca5..f1dac6d800 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -304,7 +304,7 @@ define([ // Common.Utils.InternalSettings.set("pe-settings-quick-print-button", value); // if (this.header && this.header.btnPrintQuick) // this.header.btnPrintQuick[value ? 'show' : 'hide'](); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { this.onTabBackgroundChange(); this.header.changeLogo(); } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 1f3067bcb2..26f81ada1b 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -723,7 +723,7 @@ define([ $('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide'](); $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide'](); $('tr.ui-rtl', this.el)[mode.uiRtl ? 'show' : 'hide'](); - $('tr.tab-background', this.el)[Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); + $('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); if ( !Common.UI.Themes.available() ) { $('tr.themes, tr.themes + tr.divider', this.el).hide(); } @@ -841,7 +841,7 @@ define([ var isRtlChanged = this.chRTL.$el.is(':visible') && Common.localStorage.getBool("ui-rtl", Common.Locale.isCurrentLanguageRtl()) !== this.chRTL.isChecked(); Common.localStorage.setBool("ui-rtl", this.chRTL.isChecked()); //Common.localStorage.setBool("pe-settings-quick-print-button", this.chQuickPrint.isChecked()); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { Common.localStorage.setItem("pe-settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); Common.Utils.InternalSettings.set("settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); } diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 727f168d54..ea1b5db0e6 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1399,7 +1399,7 @@ define([ } Common.Utils.InternalSettings.set("settings-tab-style", value || 'tab'); value = Common.UI.FeaturesManager.getInitValue('tabBackground', true); - if (Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("sse-settings-tab-background")) { // get from local storage + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) && Common.localStorage.itemExists("sse-settings-tab-background")) { // get from local storage value = Common.localStorage.getItem("sse-settings-tab-background"); } else if (value === undefined && this.editorConfig.customization && (typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.toolbarNoTabs) { value = 'toolbar'; diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index b4fd8c17cc..4062a97768 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -291,7 +291,7 @@ define([ // Common.Utils.InternalSettings.set("sse-settings-quick-print-button", value); // if (this.header && this.header.btnPrintQuick) // this.header.btnPrintQuick[value ? 'show' : 'hide'](); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { this.onTabBackgroundChange(); this.header.changeLogo(); } diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index d1d41ff749..287396dc37 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -896,7 +896,7 @@ define([ $('tr.live-viewer', this.el)[mode.canLiveView && !mode.isOffline && mode.canChangeCoAuthoring ? 'show' : 'hide'](); $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide'](); - $('tr.tab-background', this.el)[Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); + $('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide'](); if ( !Common.UI.Themes.available() ) { $('tr.themes, tr.themes + tr.divider', this.el).hide(); } @@ -1105,7 +1105,7 @@ define([ var isRtlChanged = this.chRTL.$el.is(':visible') && Common.localStorage.getBool("ui-rtl", Common.Locale.isCurrentLanguageRtl()) !== this.chRTL.isChecked(); Common.localStorage.setBool("ui-rtl", this.chRTL.isChecked()); //Common.localStorage.setBool("sse-settings-quick-print-button", this.chQuickPrint.isChecked()); - if (Common.UI.FeaturesManager.canChange('tabBackground', true)) { + if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) { Common.localStorage.setItem("sse-settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); Common.Utils.InternalSettings.set("settings-tab-background", this.chTabBack.isChecked() ? 'toolbar' : 'header'); }