From 702c52064a9cf5b4684ed62002dbb839c2d269fd Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 12 Mar 2024 12:30:06 +0300 Subject: [PATCH] [SSE] tuned for using with launch controller --- apps/spreadsheeteditor/main/app.js | 18 ++++++++------ .../main/app/controller/DocumentHolder.js | 4 ---- .../main/app/controller/Main.js | 6 ++--- .../main/app/view/ImageSettings.js | 1 - .../main/app/view/ParagraphSettings.js | 1 - .../main/app/view/PivotSettings.js | 1 - .../main/app/view/ShapeSettings.js | 1 - .../main/app/view/SlicerSettings.js | 1 - .../main/app/view/TableSettings.js | 1 - apps/spreadsheeteditor/main/app_dev.js | 24 +++++++++++++------ 10 files changed, 31 insertions(+), 27 deletions(-) diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 20b62c8e20..6012d3b353 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -190,15 +190,15 @@ require([ 'spreadsheeteditor/main/app/controller/Search', 'spreadsheeteditor/main/app/controller/WBProtection', 'spreadsheeteditor/main/app/view/FileMenuPanels', - 'spreadsheeteditor/main/app/view/ParagraphSettings', - 'spreadsheeteditor/main/app/view/ImageSettings', - 'spreadsheeteditor/main/app/view/ChartSettings', - 'spreadsheeteditor/main/app/view/ShapeSettings', - 'spreadsheeteditor/main/app/view/TextArtSettings', - 'spreadsheeteditor/main/app/view/PivotSettings', + // 'spreadsheeteditor/main/app/view/ParagraphSettings', + // 'spreadsheeteditor/main/app/view/ImageSettings', + // 'spreadsheeteditor/main/app/view/ChartSettings', + // 'spreadsheeteditor/main/app/view/ShapeSettings', + // 'spreadsheeteditor/main/app/view/TextArtSettings', + // 'spreadsheeteditor/main/app/view/PivotSettings', 'spreadsheeteditor/main/app/view/FieldSettingsDialog', 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', - 'spreadsheeteditor/main/app/view/SignatureSettings', + // 'spreadsheeteditor/main/app/view/SignatureSettings', 'common/main/lib/util/utils', 'common/main/lib/controller/Fonts', 'common/main/lib/controller/History', @@ -210,6 +210,10 @@ require([ ,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Draw' ], function() { + app.postLaunchScripts = [ + 'spreadsheeteditor/main/code', + ]; + app.start(); }); }); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 0569e2fe7b..2f452f4ae5 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -66,17 +66,13 @@ define([ 'common/main/lib/view/ListSettingsDialog', 'spreadsheeteditor/main/app/view/DocumentHolder', 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', - 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced', - 'spreadsheeteditor/main/app/view/ImageSettingsAdvanced', 'spreadsheeteditor/main/app/view/SetValueDialog', 'spreadsheeteditor/main/app/view/AutoFilterDialog', 'spreadsheeteditor/main/app/view/SpecialPasteDialog', - 'spreadsheeteditor/main/app/view/SlicerSettingsAdvanced', 'spreadsheeteditor/main/app/view/PivotGroupDialog', 'spreadsheeteditor/main/app/view/MacroDialog', 'spreadsheeteditor/main/app/view/FieldSettingsDialog', 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', - 'spreadsheeteditor/main/app/view/PivotSettingsAdvanced', 'spreadsheeteditor/main/app/view/PivotShowDetailDialog', 'spreadsheeteditor/main/app/view/FillSeriesDialog' ], function () { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index e96386b5d0..8d81d19504 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -57,10 +57,10 @@ define([ 'spreadsheeteditor/main/app/collection/ConditionalFormatIcons', 'spreadsheeteditor/main/app/controller/FormulaDialog', 'common/main/lib/controller/FocusManager', - 'common/main/lib/controller/ScreenReaderFocus', 'common/main/lib/controller/HintManager', 'common/main/lib/controller/LayoutManager', - 'common/main/lib/controller/ExternalUsers' + 'common/main/lib/controller/ExternalUsers', + 'common/main/lib/controller/LaunchController', ], function () { 'use strict'; @@ -192,9 +192,9 @@ define([ this.api = this.getApplication().getController('Viewport').getApi(); Common.UI.FocusManager.init(); - Common.UI.ScreenReaderFocusManager.init(this.api); Common.UI.HintManager.init(this.api); Common.UI.Themes.init(this.api); + Common.Controllers.LaunchController.init(this.api); var value = Common.localStorage.getBool("sse-settings-cachemode", true); Common.Utils.InternalSettings.set("sse-settings-cachemode", value); diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index b28d7053c7..88b6f9f425 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -45,7 +45,6 @@ define([ 'common/main/lib/component/Button', 'common/main/lib/component/MetricSpinner', 'common/main/lib/view/ImageFromUrlDialog', - 'spreadsheeteditor/main/app/view/ImageSettingsAdvanced' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js index 527eadfec6..c0f43209c3 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettings.js @@ -50,7 +50,6 @@ define([ 'backbone', 'common/main/lib/component/ComboBox', 'common/main/lib/component/MetricSpinner', - 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js index 8733628669..0689ff9fc2 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js @@ -47,7 +47,6 @@ define([ 'common/main/lib/component/ListView', 'spreadsheeteditor/main/app/view/FieldSettingsDialog', 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', - 'spreadsheeteditor/main/app/view/PivotSettingsAdvanced' ], function (menuTemplate, $, _, Backbone, Sortable) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 9fc8f524d9..7a1a9a1f58 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -51,7 +51,6 @@ define([ 'common/main/lib/component/Slider', 'common/main/lib/component/MultiSliderGradient', 'common/main/lib/view/ImageFromUrlDialog', - 'spreadsheeteditor/main/app/view/ShapeSettingsAdvanced' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettings.js b/apps/spreadsheeteditor/main/app/view/SlicerSettings.js index 4c1ecfa5ee..6695ad8cfd 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerSettings.js @@ -43,7 +43,6 @@ define([ 'backbone', 'common/main/lib/component/Button', 'common/main/lib/component/MetricSpinner', - 'spreadsheeteditor/main/app/view/SlicerSettingsAdvanced' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index c71832191b..a0abd97bc2 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -47,7 +47,6 @@ define([ 'common/main/lib/component/CheckBox', 'common/main/lib/component/ComboDataView', 'spreadsheeteditor/main/app/view/TableOptionsDialog', - 'spreadsheeteditor/main/app/view/TableSettingsAdvanced', 'spreadsheeteditor/main/app/view/SlicerAddDialog' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 66d81b3732..d53ac4159a 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -181,15 +181,15 @@ require([ 'spreadsheeteditor/main/app/controller/Search', 'spreadsheeteditor/main/app/controller/WBProtection', 'spreadsheeteditor/main/app/view/FileMenuPanels', - 'spreadsheeteditor/main/app/view/ParagraphSettings', - 'spreadsheeteditor/main/app/view/ImageSettings', - 'spreadsheeteditor/main/app/view/ChartSettings', - 'spreadsheeteditor/main/app/view/ShapeSettings', - 'spreadsheeteditor/main/app/view/TextArtSettings', - 'spreadsheeteditor/main/app/view/PivotSettings', + // 'spreadsheeteditor/main/app/view/ParagraphSettings', + // 'spreadsheeteditor/main/app/view/ImageSettings', + // 'spreadsheeteditor/main/app/view/ChartSettings', + // 'spreadsheeteditor/main/app/view/ShapeSettings', + // 'spreadsheeteditor/main/app/view/TextArtSettings', + // 'spreadsheeteditor/main/app/view/PivotSettings', 'spreadsheeteditor/main/app/view/FieldSettingsDialog', 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', - 'spreadsheeteditor/main/app/view/SignatureSettings', + // 'spreadsheeteditor/main/app/view/SignatureSettings', 'common/main/lib/util/utils', 'common/main/lib/controller/Fonts', 'common/main/lib/controller/History', @@ -201,6 +201,16 @@ require([ ,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Draw' ], function() { + app.postLaunchScripts = [ + 'common/main/lib/controller/ScreenReaderFocus', + 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced', + 'spreadsheeteditor/main/app/view/ImageSettingsAdvanced', + 'spreadsheeteditor/main/app/view/SlicerSettingsAdvanced', + 'spreadsheeteditor/main/app/view/PivotSettingsAdvanced', + 'spreadsheeteditor/main/app/view/TableSettingsAdvanced', + 'spreadsheeteditor/main/app/view/ShapeSettingsAdvanced', + ]; + window.compareVersions = true; app.start(); });