From 40db9cdc024bacdecc368767513f85caed19da0f Mon Sep 17 00:00:00 2001 From: Konstantin Kireyev Date: Mon, 8 Apr 2024 00:30:33 +0500 Subject: [PATCH] [de] delayed loading for mailmerge dialog --- apps/common/main/lib/view/AdvancedSettingsWindow.js | 4 +--- apps/documenteditor/main/app/view/MailMergeEmailDlg.js | 6 ++---- apps/documenteditor/main/app/view/MailMergeSettings.js | 3 +-- apps/documenteditor/main/app/view/Statusbar.js | 3 ++- apps/documenteditor/main/app_dev.js | 3 ++- apps/documenteditor/main/app_pack.js | 2 ++ 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 4753d934ce..4bce0086dc 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -37,9 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window' -], function () { 'use strict'; +define([], function () { 'use strict'; Common.Views.AdvancedSettingsWindow = Common.UI.Window.extend(_.extend({ initialize : function(options) { diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js index fe70293ece..62d1e25033 100644 --- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js @@ -35,10 +35,8 @@ * Time: 16:47 */ -define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template', - 'common/main/lib/view/AdvancedSettingsWindow', - 'common/main/lib/component/ComboBox', - 'common/main/lib/component/InputField' +define([ + 'text!documenteditor/main/app/template/MailMergeEmailDlg.template' ], function (contentTemplate) { 'use strict'; diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index 90da681c13..7932813bd9 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -40,8 +40,7 @@ define([ 'underscore', 'backbone', 'common/main/lib/component/Button', - 'common/main/lib/component/CheckBox', - 'documenteditor/main/app/view/MailMergeEmailDlg' + 'common/main/lib/component/CheckBox' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index effa6d0026..18bc980824 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -45,7 +45,8 @@ define([ 'tip', 'common/main/lib/component/Menu', 'common/main/lib/component/Window', - 'documenteditor/main/app/model/Pages' + 'documenteditor/main/app/model/Pages', + 'common/main/lib/component/InputField', ], function(template, $, _, Backbone){ 'use strict'; diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index 891c46fadf..1b9161409b 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -219,6 +219,7 @@ require([ 'common/main/lib/view/OpenDialog', 'common/main/lib/view/UserNameDialog', 'common/main/lib/view/SearchDialog', + 'common/main/lib/view/AdvancedSettingsWindow', 'documenteditor/main/app/view/ParagraphSettingsAdvanced', 'documenteditor/main/app/view/ImageSettingsAdvanced', @@ -254,7 +255,7 @@ require([ 'documenteditor/main/app/view/NumberingValueDialog', 'documenteditor/main/app/view/ListIndentsDialog', 'documenteditor/main/app/view/ProtectDialog', - // 'documenteditor/main/app/view/MailMergeEmailDlg' + 'documenteditor/main/app/view/MailMergeEmailDlg' ]; window.compareVersions = true; diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js index ea85c94c61..a0b3814165 100644 --- a/apps/documenteditor/main/app_pack.js +++ b/apps/documenteditor/main/app_pack.js @@ -1,4 +1,5 @@ require([ + 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/controller/ScreenReaderFocus', 'common/main/lib/component/ComboBoxDataView', 'common/main/lib/view/OptionsDialog', @@ -51,5 +52,6 @@ require([ 'documenteditor/main/app/view/NumberingValueDialog', 'documenteditor/main/app/view/ListIndentsDialog', 'documenteditor/main/app/view/ProtectDialog', + 'documenteditor/main/app/view/MailMergeEmailDlg' ], function () { });