From 0fec93d7a82c01adbc429ed3a0bc84e8cb37920a Mon Sep 17 00:00:00 2001 From: Konstantin Kireyev Date: Fri, 19 Jul 2024 17:37:34 +0500 Subject: [PATCH] fix/[pdf,se]: post-load dialogs --- apps/common/main/lib/view/SearchPanel.js | 3 ++- apps/pdfeditor/main/app_dev.js | 1 + apps/pdfeditor/main/app_pack.js | 3 +++ .../main/app/controller/DocumentHolder.js | 6 +----- .../main/app/controller/Toolbar.js | 7 ------- .../main/app/view/AdvancedSeparatorDialog.js | 5 +---- .../main/app/view/AutoFilterDialog.js | 6 +----- .../main/app/view/HeaderFooterDialog.js | 7 +------ .../main/app/view/HyperlinkSettingsDialog.js | 8 +------- .../main/app/view/PageMarginsDialog.js | 5 +---- .../main/app/view/PrintTitlesDialog.js | 5 +---- .../main/app/view/ScaleDialog.js | 5 +---- .../main/app/view/SetValueDialog.js | 5 +---- .../main/app/view/TableOptionsDialog.js | 7 +------ apps/spreadsheeteditor/main/app_dev.js | 18 +++++++++++++----- apps/spreadsheeteditor/main/app_pack.js | 18 +++++++++++++----- 16 files changed, 42 insertions(+), 67 deletions(-) diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js index caf3035891..9d71e31610 100644 --- a/apps/common/main/lib/view/SearchPanel.js +++ b/apps/common/main/lib/view/SearchPanel.js @@ -38,7 +38,8 @@ define([ 'text!common/main/lib/template/SearchPanel.template', 'common/main/lib/util/utils', 'common/main/lib/component/BaseView', - 'common/main/lib/component/Layout' + 'common/main/lib/component/Layout', + 'common/main/lib/component/InputField', ], function (template) { 'use strict'; diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js index d9f7f84961..0b6517f0cd 100644 --- a/apps/pdfeditor/main/app_dev.js +++ b/apps/pdfeditor/main/app_dev.js @@ -183,6 +183,7 @@ require([ ], function() { app.postLaunchScripts = [ 'common/main/lib/controller/ScreenReaderFocus', + 'common/main/lib/component/ComboBoxDataView', 'common/main/lib/component/ListView', 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/view/AutoCorrectDialog', diff --git a/apps/pdfeditor/main/app_pack.js b/apps/pdfeditor/main/app_pack.js index 486332ee29..f5f2c7aa2d 100644 --- a/apps/pdfeditor/main/app_pack.js +++ b/apps/pdfeditor/main/app_pack.js @@ -1,6 +1,7 @@ require([ 'common/main/lib/controller/ScreenReaderFocus', 'common/main/lib/component/ListView', + 'common/main/lib/component/ComboBoxDataView', 'common/main/lib/view/AdvancedSettingsWindow', 'common/main/lib/view/AutoCorrectDialog', 'common/main/lib/view/DocumentAccessDialog', @@ -22,6 +23,8 @@ require([ 'pdfeditor/main/app/view/ParagraphSettingsAdvanced', 'pdfeditor/main/app/view/ImageSettingsAdvanced', 'pdfeditor/main/app/view/HyperlinkSettingsDialog', + 'pdfeditor/main/app/view/ShapeSettingsAdvanced', + 'pdfeditor/main/app/view/TableSettingsAdvanced', ], function () { Common.NotificationCenter.trigger('script:loaded'); }); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a1ac8830e8..bda29297ad 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -61,11 +61,7 @@ define([ 'core', 'common/main/lib/util/utils', 'common/main/lib/util/Shortcuts', - 'spreadsheeteditor/main/app/view/DocumentHolder', - 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', - 'spreadsheeteditor/main/app/view/SetValueDialog', - 'spreadsheeteditor/main/app/view/AutoFilterDialog', - 'spreadsheeteditor/main/app/view/PivotGroupDialog' + 'spreadsheeteditor/main/app/view/DocumentHolder' ], function () { 'use strict'; diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 571d18b7ad..2e9454c9dd 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -45,13 +45,6 @@ define([ 'spreadsheeteditor/main/app/view/Toolbar', 'spreadsheeteditor/main/app/collection/TableTemplates', 'spreadsheeteditor/main/app/controller/PivotTable', - 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', - 'spreadsheeteditor/main/app/view/TableOptionsDialog', - 'spreadsheeteditor/main/app/view/PageMarginsDialog', - 'spreadsheeteditor/main/app/view/HeaderFooterDialog', - 'spreadsheeteditor/main/app/view/PrintTitlesDialog', - 'spreadsheeteditor/main/app/view/ScaleDialog', - 'spreadsheeteditor/main/app/view/AdvancedSeparatorDialog', ], function () { 'use strict'; SSE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ diff --git a/apps/spreadsheeteditor/main/app/view/AdvancedSeparatorDialog.js b/apps/spreadsheeteditor/main/app/view/AdvancedSeparatorDialog.js index a2087d6826..d6d8ad02eb 100644 --- a/apps/spreadsheeteditor/main/app/view/AdvancedSeparatorDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AdvancedSeparatorDialog.js @@ -37,10 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/InputField' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.AdvancedSeparatorDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index 97985ff184..2cbdc48353 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -39,11 +39,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/ColorPaletteExt', - 'common/main/lib/component/Calendar' -], function () { +define([], function () { 'use strict'; SSE.Views = SSE.Views || {}; diff --git a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js index 58f28c8730..8c06516a7e 100644 --- a/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js @@ -38,12 +38,7 @@ */ -define([ - 'common/main/lib/util/utils', - 'common/main/lib/component/InputField', - 'common/main/lib/component/Window', - 'common/main/lib/component/ComboBoxFonts' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.HeaderFooterDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 86cc219ecd..4ce62d5fd1 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -41,13 +41,7 @@ if (Common === undefined) var Common = {}; -define([ - 'common/main/lib/util/utils', - 'common/main/lib/component/ComboBox', - 'common/main/lib/component/InputField', - 'common/main/lib/component/Window', - 'common/main/lib/component/TreeView' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.HyperlinkSettingsDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js b/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js index fec1410f4f..250521892d 100644 --- a/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js @@ -37,10 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/MetricSpinner' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.PageMarginsDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js index 554964bbb6..a1415b1ceb 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js @@ -37,10 +37,7 @@ * Copyright (c) 2020 Ascensio System SIA. All rights reserved. * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/MetricSpinner' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.PrintTitlesDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js index 4669f9fea8..474c43830b 100644 --- a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js @@ -37,10 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/MetricSpinner' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.ScaleDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js index bb63c96000..a7ce48ea84 100644 --- a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js @@ -37,10 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/ComboBox' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.SetValueDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js index be858d94ff..45402c46bc 100644 --- a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js @@ -41,12 +41,7 @@ if (Common === undefined) var Common = {}; -define([ - 'common/main/lib/component/ComboBox', - 'common/main/lib/component/CheckBox', - 'common/main/lib/component/InputField', - 'common/main/lib/component/Window' -], function () { 'use strict'; +define([], function () { 'use strict'; SSE.Views.TableOptionsDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 5fb0126064..65be089b4f 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -220,18 +220,15 @@ require([ 'spreadsheeteditor/main/app/view/ChartDataDialog', 'spreadsheeteditor/main/app/view/SortDialog', 'spreadsheeteditor/main/app/view/ViewManagerDlg', - // 'spreadsheeteditor/main/app/view/CellSettings', 'spreadsheeteditor/main/app/view/ChartDataDialog', - // 'spreadsheeteditor/main/app/view/ChartSettings', 'spreadsheeteditor/main/app/view/ChartTypeDialog', 'spreadsheeteditor/main/app/view/ExternalLinksDlg', - // 'spreadsheeteditor/main/app/view/FileMenuPanels', + 'spreadsheeteditor/main/app/view/FormatRulesEditDlg', 'spreadsheeteditor/main/app/view/FormatRulesManagerDlg', 'spreadsheeteditor/main/app/view/MacroDialog', 'spreadsheeteditor/main/app/view/NameManagerDlg', 'spreadsheeteditor/main/app/view/NamedRangePasteDlg', 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced', - // 'spreadsheeteditor/main/app/view/PivotSettings', 'spreadsheeteditor/main/app/view/PrintSettings', 'spreadsheeteditor/main/app/view/ProtectRangesDlg', 'spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg', @@ -263,7 +260,18 @@ require([ 'spreadsheeteditor/main/app/view/ShapeSettingsAdvanced', 'spreadsheeteditor/main/app/view/ProtectDialog', 'spreadsheeteditor/main/app/view/ProtectedRangesEditDlg', - 'spreadsheeteditor/main/app/view/CreatePivotDialog' + 'spreadsheeteditor/main/app/view/CreatePivotDialog', + 'spreadsheeteditor/main/app/view/SortOptionsDialog', + 'spreadsheeteditor/main/app/view/TableOptionsDialog', + 'spreadsheeteditor/main/app/view/SetValueDialog', + 'spreadsheeteditor/main/app/view/ScaleDialog', + 'spreadsheeteditor/main/app/view/PrintTitlesDialog', + 'spreadsheeteditor/main/app/view/TableOptionsDialog', + 'spreadsheeteditor/main/app/view/PageMarginsDialog', + 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', + 'spreadsheeteditor/main/app/view/HeaderFooterDialog', + 'spreadsheeteditor/main/app/view/AdvancedSeparatorDialog', + 'spreadsheeteditor/main/app/view/AutoFilterDialog', ]; window.compareVersions = true; diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js index 706ea72e4d..dbf84d5f0b 100644 --- a/apps/spreadsheeteditor/main/app_pack.js +++ b/apps/spreadsheeteditor/main/app_pack.js @@ -25,18 +25,15 @@ require([ 'spreadsheeteditor/main/app/view/ChartDataDialog', 'spreadsheeteditor/main/app/view/SortDialog', 'spreadsheeteditor/main/app/view/ViewManagerDlg', - // 'spreadsheeteditor/main/app/view/CellSettings', 'spreadsheeteditor/main/app/view/ChartDataDialog', - // 'spreadsheeteditor/main/app/view/ChartSettings', 'spreadsheeteditor/main/app/view/ChartTypeDialog', 'spreadsheeteditor/main/app/view/ExternalLinksDlg', - // 'spreadsheeteditor/main/app/view/FileMenuPanels', + 'spreadsheeteditor/main/app/view/FormatRulesEditDlg', 'spreadsheeteditor/main/app/view/FormatRulesManagerDlg', 'spreadsheeteditor/main/app/view/MacroDialog', 'spreadsheeteditor/main/app/view/NameManagerDlg', 'spreadsheeteditor/main/app/view/NamedRangePasteDlg', 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced', - // 'spreadsheeteditor/main/app/view/PivotSettings', 'spreadsheeteditor/main/app/view/PrintSettings', 'spreadsheeteditor/main/app/view/ProtectRangesDlg', 'spreadsheeteditor/main/app/view/ProtectedRangesManagerDlg', @@ -68,7 +65,18 @@ require([ 'spreadsheeteditor/main/app/view/ShapeSettingsAdvanced', 'spreadsheeteditor/main/app/view/ProtectDialog', 'spreadsheeteditor/main/app/view/ProtectedRangesEditDlg', - 'spreadsheeteditor/main/app/view/CreatePivotDialog' + 'spreadsheeteditor/main/app/view/CreatePivotDialog', + 'spreadsheeteditor/main/app/view/SortOptionsDialog', + 'spreadsheeteditor/main/app/view/TableOptionsDialog', + 'spreadsheeteditor/main/app/view/SetValueDialog', + 'spreadsheeteditor/main/app/view/ScaleDialog', + 'spreadsheeteditor/main/app/view/PrintTitlesDialog', + 'spreadsheeteditor/main/app/view/TableOptionsDialog', + 'spreadsheeteditor/main/app/view/PageMarginsDialog', + 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', + 'spreadsheeteditor/main/app/view/HeaderFooterDialog', + 'spreadsheeteditor/main/app/view/AdvancedSeparatorDialog', + 'spreadsheeteditor/main/app/view/AutoFilterDialog', ], function () { Common.NotificationCenter.trigger('script:loaded'); });