From ed0278641ea6642e8b7fe2deb657fa190b840240 Mon Sep 17 00:00:00 2001 From: Konstantin Kireyev Date: Mon, 22 Jul 2024 18:24:16 +0500 Subject: [PATCH] fix: open dialog, imports for delayed dialogs --- apps/common/main/lib/component/ColorPaletteExt.js | 4 +--- apps/common/main/lib/view/CustomizeQuickAccessDialog.js | 4 +--- apps/common/main/lib/view/OpenDialog.js | 4 +++- apps/documenteditor/main/app/controller/Main.js | 1 + apps/documenteditor/main/app/view/DocProtection.js | 3 ++- apps/documenteditor/main/app_dev.js | 2 +- apps/documenteditor/main/app_pack.js | 4 ++-- apps/pdfeditor/main/app/controller/Main.js | 3 ++- apps/pdfeditor/main/app_dev.js | 1 - apps/pdfeditor/main/app_pack.js | 3 +-- apps/presentationeditor/main/app/controller/Main.js | 1 + apps/presentationeditor/main/app_dev.js | 2 +- apps/presentationeditor/main/app_pack.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/main/app/view/DataTab.js | 4 +++- apps/spreadsheeteditor/main/app/view/DataValidationDialog.js | 2 +- apps/spreadsheeteditor/main/app/view/DocumentHolder.js | 3 ++- apps/spreadsheeteditor/main/app/view/WBProtection.js | 3 ++- apps/spreadsheeteditor/main/app_dev.js | 3 ++- apps/spreadsheeteditor/main/app_pack.js | 3 ++- 20 files changed, 30 insertions(+), 23 deletions(-) diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js index 7b042766b1..ade854864f 100644 --- a/apps/common/main/lib/component/ColorPaletteExt.js +++ b/apps/common/main/lib/component/ColorPaletteExt.js @@ -40,9 +40,7 @@ if (Common === undefined) var Common = {}; -define([ - 'common/main/lib/component/BaseView' -], function () { 'use strict'; +define([], function () { 'use strict'; Common.UI.ColorPaletteExt = Common.UI.BaseView.extend({ options: { diff --git a/apps/common/main/lib/view/CustomizeQuickAccessDialog.js b/apps/common/main/lib/view/CustomizeQuickAccessDialog.js index 0e786b9dcd..14052cff39 100644 --- a/apps/common/main/lib/view/CustomizeQuickAccessDialog.js +++ b/apps/common/main/lib/view/CustomizeQuickAccessDialog.js @@ -40,9 +40,7 @@ if (Common === undefined) var Common = {}; -define([ - 'common/main/lib/component/Window' -], function () { 'use strict'; +define([], function () { 'use strict'; Common.Views.CustomizeQuickAccessDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index d70085793f..7138108c46 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -39,7 +39,9 @@ * */ -define([], function () { +define([ + 'common/main/lib/component/Window' +], function () { 'use strict'; Common.Views.OpenDialog = Common.UI.Window.extend(_.extend({ diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 76829f5cb9..52072a5772 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -55,6 +55,7 @@ define([ 'common/main/lib/controller/LayoutManager', 'common/main/lib/controller/ExternalUsers', 'common/main/lib/controller/LaunchController', + 'common/main/lib/view/OpenDialog' ], function () { 'use strict'; diff --git a/apps/documenteditor/main/app/view/DocProtection.js b/apps/documenteditor/main/app/view/DocProtection.js index 453f5208d8..19d913b299 100644 --- a/apps/documenteditor/main/app/view/DocProtection.js +++ b/apps/documenteditor/main/app/view/DocProtection.js @@ -41,7 +41,8 @@ define([ 'common/main/lib/util/utils', 'common/main/lib/component/BaseView', 'common/main/lib/component/Layout', - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/view/OpenDialog' ], function (template) { 'use strict'; diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index 3daf59884d..d21448aaf1 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -210,7 +210,6 @@ require([ 'common/main/lib/view/SaveAsDlg', 'common/main/lib/view/AutoCorrectDialog', 'common/main/lib/view/DocumentAccessDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/UserNameDialog', 'common/main/lib/view/SearchDialog', 'common/main/lib/view/AdvancedSettingsWindow', @@ -223,6 +222,7 @@ require([ 'common/main/lib/view/ExternalMergeEditor', 'common/main/lib/view/ExternalOleEditor', 'common/main/lib/view/ShapeShadowDialog', + 'common/main/lib/view/CustomizeQuickAccessDialog', 'documenteditor/main/app/view/ParagraphSettingsAdvanced', 'documenteditor/main/app/view/ImageSettingsAdvanced', diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js index 39efd96d3f..1d77ac7cfc 100644 --- a/apps/documenteditor/main/app_pack.js +++ b/apps/documenteditor/main/app_pack.js @@ -1,5 +1,4 @@ require([ - 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/controller/ScreenReaderFocus', 'common/main/lib/component/ComboBoxDataView', 'common/main/lib/component/ListView', @@ -15,9 +14,9 @@ require([ 'common/main/lib/view/SaveAsDlg', 'common/main/lib/view/AutoCorrectDialog', 'common/main/lib/view/DocumentAccessDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/UserNameDialog', 'common/main/lib/view/SearchDialog', + 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/view/PluginDlg', 'common/main/lib/view/PluginPanel', 'common/main/lib/view/ExtendedColorDialog', @@ -27,6 +26,7 @@ require([ 'common/main/lib/view/ExternalMergeEditor', 'common/main/lib/view/ExternalOleEditor', 'common/main/lib/view/ShapeShadowDialog', + 'common/main/lib/view/CustomizeQuickAccessDialog', 'documenteditor/main/app/view/ParagraphSettingsAdvanced', 'documenteditor/main/app/view/ImageSettingsAdvanced', diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index 005b565189..d4233ee979 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -51,7 +51,8 @@ define([ 'common/main/lib/controller/LaunchController', 'common/main/lib/controller/HintManager', 'common/main/lib/controller/LayoutManager', - 'common/main/lib/controller/ExternalUsers' + 'common/main/lib/controller/ExternalUsers', + 'common/main/lib/view/OpenDialog' ], function () { 'use strict'; diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js index 0b6517f0cd..2c779878df 100644 --- a/apps/pdfeditor/main/app_dev.js +++ b/apps/pdfeditor/main/app_dev.js @@ -194,7 +194,6 @@ require([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SearchDialog', 'common/main/lib/view/RenameDialog', diff --git a/apps/pdfeditor/main/app_pack.js b/apps/pdfeditor/main/app_pack.js index f5f2c7aa2d..23f2723876 100644 --- a/apps/pdfeditor/main/app_pack.js +++ b/apps/pdfeditor/main/app_pack.js @@ -1,7 +1,7 @@ require([ 'common/main/lib/controller/ScreenReaderFocus', - 'common/main/lib/component/ListView', 'common/main/lib/component/ComboBoxDataView', + 'common/main/lib/component/ListView', 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/view/AutoCorrectDialog', 'common/main/lib/view/DocumentAccessDialog', @@ -11,7 +11,6 @@ require([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SearchDialog', 'common/main/lib/view/RenameDialog', diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 13d65cf4df..95e3245350 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -57,6 +57,7 @@ define([ 'common/main/lib/controller/LayoutManager', 'common/main/lib/controller/ExternalUsers', 'common/main/lib/controller/LaunchController', + 'common/main/lib/view/OpenDialog' ], function () { 'use strict'; PE.Controllers.Main = Backbone.Controller.extend(_.extend((function() { diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index c72eb33992..ee49dc857a 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -205,7 +205,6 @@ require([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/ExternalEditor', 'common/main/lib/view/ExternalDiagramEditor', 'common/main/lib/view/ExternalOleEditor', @@ -217,6 +216,7 @@ require([ 'common/main/lib/view/PluginDlg', 'common/main/lib/view/PluginPanel', 'common/main/lib/view/ShapeShadowDialog', + 'common/main/lib/view/CustomizeQuickAccessDialog', 'presentationeditor/main/app/view/ParagraphSettingsAdvanced', 'presentationeditor/main/app/view/ShapeSettingsAdvanced', diff --git a/apps/presentationeditor/main/app_pack.js b/apps/presentationeditor/main/app_pack.js index d0263aed69..96176f18cf 100644 --- a/apps/presentationeditor/main/app_pack.js +++ b/apps/presentationeditor/main/app_pack.js @@ -10,7 +10,6 @@ require([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/ExternalEditor', 'common/main/lib/view/ExternalDiagramEditor', 'common/main/lib/view/ExternalOleEditor', @@ -22,6 +21,7 @@ require([ 'common/main/lib/view/PluginDlg', 'common/main/lib/view/PluginPanel', 'common/main/lib/view/ShapeShadowDialog', + 'common/main/lib/view/CustomizeQuickAccessDialog', 'presentationeditor/main/app/view/ParagraphSettingsAdvanced', 'presentationeditor/main/app/view/ShapeSettingsAdvanced', diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 663b5ba8e0..089edd24a1 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -60,6 +60,7 @@ define([ 'common/main/lib/controller/LayoutManager', 'common/main/lib/controller/ExternalUsers', 'common/main/lib/controller/LaunchController', + 'common/main/lib/view/OpenDialog', ], function () { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index f4a4aa0254..4971c8bb09 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -40,7 +40,9 @@ define([ 'common/main/lib/util/utils', 'common/main/lib/component/BaseView', - 'common/main/lib/component/Layout' + 'common/main/lib/component/Layout', + 'common/main/lib/view/OpenDialog', + 'common/main/lib/component/TextareaField' ], function () { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js index 16ab6dc9a3..aaef7cde51 100644 --- a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js +++ b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js @@ -40,7 +40,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.template', - 'common/main/lib/view/AdvancedSettingsWindow', + 'common/main/lib/view/AdvancedSettingsWindow' ], function (contentTemplate) { 'use strict'; SSE.Views.DataValidationDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 17cdf6b5ca..5e8b98e978 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -44,7 +44,8 @@ define([ 'underscore', 'backbone', 'gateway', - 'common/main/lib/component/Menu' + 'common/main/lib/component/Menu', + 'common/main/lib/view/OpenDialog' ], function ($, _, Backbone, gateway) { 'use strict'; SSE.Views.DocumentHolder = Backbone.View.extend(_.extend({ diff --git a/apps/spreadsheeteditor/main/app/view/WBProtection.js b/apps/spreadsheeteditor/main/app/view/WBProtection.js index cc0fd68fb8..80c70f3773 100644 --- a/apps/spreadsheeteditor/main/app/view/WBProtection.js +++ b/apps/spreadsheeteditor/main/app/view/WBProtection.js @@ -41,7 +41,8 @@ define([ 'common/main/lib/util/utils', 'common/main/lib/component/BaseView', 'common/main/lib/component/Layout', - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/view/OpenDialog' ], function (template) { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 65be089b4f..28290ee544 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -196,6 +196,7 @@ require([ app.postLaunchScripts = [ 'common/main/lib/controller/ScreenReaderFocus', 'common/main/lib/component/ListView', + 'common/main/lib/component/ColorPaletteExt', 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/view/OptionsDialog', 'common/main/lib/view/AutoCorrectDialog', @@ -206,7 +207,6 @@ require([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/view/ExternalEditor', 'common/main/lib/view/ExternalOleEditor', @@ -215,6 +215,7 @@ require([ 'common/main/lib/view/PluginDlg', 'common/main/lib/view/PluginPanel', 'common/main/lib/view/ShapeShadowDialog', + 'common/main/lib/view/CustomizeQuickAccessDialog', 'spreadsheeteditor/main/app/view/PivotShowDetailDialog', 'spreadsheeteditor/main/app/view/ChartDataDialog', diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js index dbf84d5f0b..d7034af544 100644 --- a/apps/spreadsheeteditor/main/app_pack.js +++ b/apps/spreadsheeteditor/main/app_pack.js @@ -1,6 +1,7 @@ require([ 'common/main/lib/controller/ScreenReaderFocus', 'common/main/lib/component/ListView', + 'common/main/lib/component/ColorPaletteExt', 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/view/OptionsDialog', 'common/main/lib/view/AutoCorrectDialog', @@ -11,7 +12,6 @@ require([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', - 'common/main/lib/view/OpenDialog', 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/view/ExternalEditor', 'common/main/lib/view/ExternalOleEditor', @@ -20,6 +20,7 @@ require([ 'common/main/lib/view/PluginDlg', 'common/main/lib/view/PluginPanel', 'common/main/lib/view/ShapeShadowDialog', + 'common/main/lib/view/CustomizeQuickAccessDialog', 'spreadsheeteditor/main/app/view/PivotShowDetailDialog', 'spreadsheeteditor/main/app/view/ChartDataDialog',