diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 907ba7fa4e..76679fa3f0 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -54,7 +54,7 @@ define([ 'common/main/lib/controller/HintManager', 'common/main/lib/controller/LayoutManager', 'common/main/lib/controller/ExternalUsers', - // 'common/main/lib/controller/LaunchController', + 'common/main/lib/controller/LaunchController', 'common/main/lib/controller/ScreenReaderFocus', ], function () { 'use strict'; @@ -198,7 +198,7 @@ define([ Common.UI.HintManager.init(this.api); Common.UI.Themes.init(this.api); Common.UI.ScreenReaderFocusManager.init(this.api); - // Common.Controllers.LaunchController.init(this.api); + Common.Controllers.LaunchController.init(this.api); if (this.api){ this.api.SetDrawingFreeze(true); diff --git a/apps/pdfeditor/main/app/view/ParagraphSettings.js b/apps/pdfeditor/main/app/view/ParagraphSettings.js index 784d9fe42e..a218af7fd6 100644 --- a/apps/pdfeditor/main/app/view/ParagraphSettings.js +++ b/apps/pdfeditor/main/app/view/ParagraphSettings.js @@ -43,8 +43,7 @@ define([ 'underscore', 'backbone', 'common/main/lib/component/ComboBox', - 'common/main/lib/component/MetricSpinner', - 'pdfeditor/main/app/view/ParagraphSettingsAdvanced' + 'common/main/lib/component/MetricSpinner' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/pdfeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/pdfeditor/main/app/view/ParagraphSettingsAdvanced.js index c0b8f3bc4b..26a7cb171d 100644 --- a/apps/pdfeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/pdfeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -37,12 +37,8 @@ * */ -define([ 'text!pdfeditor/main/app/template/ParagraphSettingsAdvanced.template', - 'common/main/lib/view/AdvancedSettingsWindow', - 'common/main/lib/component/MetricSpinner', - 'common/main/lib/component/CheckBox', - 'common/main/lib/component/RadioBox', - 'common/main/lib/component/ListView' +define([ + 'text!pdfeditor/main/app/template/ParagraphSettingsAdvanced.template', ], function (contentTemplate) { 'use strict'; diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js index b712a1d579..4bbfcf1f79 100644 --- a/apps/pdfeditor/main/app_dev.js +++ b/apps/pdfeditor/main/app_dev.js @@ -178,7 +178,8 @@ require([ // ,'common/main/lib/controller/ExternalDiagramEditor' // ,'common/main/lib/controller/ExternalOleEditor' ,'common/main/lib/controller/Draw' - ,'common/main/lib/controller/Protection' + ,'common/main/lib/controller/Protection', + 'common/main/lib/collection/TextArt' ], function() { app.postLaunchScripts = [ 'common/main/lib/controller/ScreenReaderFocus', @@ -194,7 +195,12 @@ require([ 'common/main/lib/view/SymbolTableDialog', 'common/main/lib/view/OpenDialog', 'common/main/lib/view/InsertTableDialog', - 'common/main/lib/view/SearchDialog' + 'common/main/lib/view/SearchDialog', + 'common/main/lib/view/RenameDialog', + 'common/main/lib/view/PluginDlg', + 'common/main/lib/view/PluginPanel', + + 'pdfeditor/main/app/view/ParagraphSettingsAdvanced' ]; window.compareVersions = true; diff --git a/apps/pdfeditor/main/app_pack.js b/apps/pdfeditor/main/app_pack.js index 2b93927c97..3df489deae 100644 --- a/apps/pdfeditor/main/app_pack.js +++ b/apps/pdfeditor/main/app_pack.js @@ -12,7 +12,12 @@ require([ 'common/main/lib/view/SymbolTableDialog', 'common/main/lib/view/OpenDialog', 'common/main/lib/view/InsertTableDialog', - 'common/main/lib/view/SearchDialog' + 'common/main/lib/view/SearchDialog', + 'common/main/lib/view/RenameDialog', + 'common/main/lib/view/PluginDlg', + 'common/main/lib/view/PluginPanel', + + 'pdfeditor/main/app/view/ParagraphSettingsAdvanced' ], function () { Common.NotificationCenter.trigger('script:loaded'); }); diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index 32011771ab..1511be1d9a 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -211,6 +211,11 @@ require([ 'common/main/lib/view/ExternalOleEditor', 'common/main/lib/view/LanguageDialog', 'common/main/lib/view/SearchDialog', + 'common/main/lib/view/InsertTableDialog', + 'common/main/lib/view/RenameDialog', + 'common/main/lib/view/PasswordDialog', + 'common/main/lib/view/PluginDlg', + 'common/main/lib/view/PluginPanel', '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 bc2a7389b8..953962ae81 100644 --- a/apps/presentationeditor/main/app_pack.js +++ b/apps/presentationeditor/main/app_pack.js @@ -16,6 +16,11 @@ require([ 'common/main/lib/view/ExternalOleEditor', 'common/main/lib/view/LanguageDialog', 'common/main/lib/view/SearchDialog', + 'common/main/lib/view/InsertTableDialog', + 'common/main/lib/view/RenameDialog', + 'common/main/lib/view/PasswordDialog', + 'common/main/lib/view/PluginDlg', + 'common/main/lib/view/PluginPanel', 'presentationeditor/main/app/view/ParagraphSettingsAdvanced', 'presentationeditor/main/app/view/ShapeSettingsAdvanced', diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 05d181faf4..478acc9f24 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -210,6 +210,10 @@ require([ 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/view/ExternalEditor', 'common/main/lib/view/ExternalOleEditor', + 'common/main/lib/view/RenameDialog', + 'common/main/lib/view/PasswordDialog', + 'common/main/lib/view/PluginDlg', + 'common/main/lib/view/PluginPanel', 'spreadsheeteditor/main/app/view/PivotShowDetailDialog', 'spreadsheeteditor/main/app/view/ChartDataDialog', @@ -257,7 +261,8 @@ require([ 'spreadsheeteditor/main/app/view/TableSettingsAdvanced', 'spreadsheeteditor/main/app/view/ShapeSettingsAdvanced', 'spreadsheeteditor/main/app/view/ProtectDialog', - 'spreadsheeteditor/main/app/view/ProtectedRangesEditDlg' + 'spreadsheeteditor/main/app/view/ProtectedRangesEditDlg', + 'spreadsheeteditor/main/app/view/CreatePivotDialog' ]; window.compareVersions = true; diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js index b600ffa288..cd85c39618 100644 --- a/apps/spreadsheeteditor/main/app_pack.js +++ b/apps/spreadsheeteditor/main/app_pack.js @@ -15,6 +15,10 @@ require([ 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/view/ExternalEditor', 'common/main/lib/view/ExternalOleEditor', + 'common/main/lib/view/RenameDialog', + 'common/main/lib/view/PasswordDialog', + 'common/main/lib/view/PluginDlg', + 'common/main/lib/view/PluginPanel', 'spreadsheeteditor/main/app/view/PivotShowDetailDialog', 'spreadsheeteditor/main/app/view/ChartDataDialog', @@ -25,6 +29,7 @@ require([ // 'spreadsheeteditor/main/app/view/ChartSettings', 'spreadsheeteditor/main/app/view/ChartTypeDialog', 'spreadsheeteditor/main/app/view/ExternalLinksDlg', + // 'spreadsheeteditor/main/app/view/FileMenuPanels', 'spreadsheeteditor/main/app/view/FormatRulesManagerDlg', 'spreadsheeteditor/main/app/view/MacroDialog', 'spreadsheeteditor/main/app/view/NameManagerDlg', @@ -61,7 +66,8 @@ require([ 'spreadsheeteditor/main/app/view/TableSettingsAdvanced', 'spreadsheeteditor/main/app/view/ShapeSettingsAdvanced', 'spreadsheeteditor/main/app/view/ProtectDialog', - 'spreadsheeteditor/main/app/view/ProtectedRangesEditDlg' + 'spreadsheeteditor/main/app/view/ProtectedRangesEditDlg', + 'spreadsheeteditor/main/app/view/CreatePivotDialog' ], function () { Common.NotificationCenter.trigger('script:loaded'); });