diff --git a/apps/common/main/lib/controller/Draw.js b/apps/common/main/lib/controller/Draw.js index 578f4e13bf..e70f100578 100644 --- a/apps/common/main/lib/controller/Draw.js +++ b/apps/common/main/lib/controller/Draw.js @@ -44,10 +44,7 @@ Common.Controllers = Common.Controllers || {}; define([ 'core', - 'common/main/lib/view/Draw', - 'common/main/lib/view/PasswordDialog', - 'common/main/lib/view/SignDialog', - 'common/main/lib/view/SignSettingsDialog' + 'common/main/lib/view/Draw' ], function () { 'use strict'; diff --git a/apps/common/main/lib/controller/Protection.js b/apps/common/main/lib/controller/Protection.js index fe1d2262b4..d6810ab56b 100644 --- a/apps/common/main/lib/controller/Protection.js +++ b/apps/common/main/lib/controller/Protection.js @@ -44,10 +44,7 @@ Common.Controllers = Common.Controllers || {}; define([ 'core', - 'common/main/lib/view/Protection', - 'common/main/lib/view/PasswordDialog', - 'common/main/lib/view/SignDialog', - 'common/main/lib/view/SignSettingsDialog' + 'common/main/lib/view/Protection' ], function () { 'use strict'; diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js index 0d34cca8da..9394d188de 100644 --- a/apps/common/main/lib/view/PasswordDialog.js +++ b/apps/common/main/lib/view/PasswordDialog.js @@ -39,9 +39,7 @@ * */ -define([ - 'common/main/lib/component/Window' -], function () { +define([], function () { 'use strict'; Common.Views.PasswordDialog = Common.UI.Window.extend(_.extend({ diff --git a/apps/common/main/lib/view/SaveAsDlg.js b/apps/common/main/lib/view/SaveAsDlg.js index 52d7f9ef9e..7e3cdb057d 100644 --- a/apps/common/main/lib/view/SaveAsDlg.js +++ b/apps/common/main/lib/view/SaveAsDlg.js @@ -34,10 +34,7 @@ * Copyright (c) 2018 Ascensio System SIA. All rights reserved. */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/LoadMask' -], function () { 'use strict'; +define([], function () { 'use strict'; Common.Views.SaveAsDlg = Common.UI.Window.extend(_.extend({ initialize : function(options) { diff --git a/apps/common/main/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js index 23d66706ce..dd12ef5948 100644 --- a/apps/common/main/lib/view/SignDialog.js +++ b/apps/common/main/lib/view/SignDialog.js @@ -41,12 +41,7 @@ if (Common === undefined) var Common = {}; -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'; Common.Views.SignDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/common/main/lib/view/SignSettingsDialog.js b/apps/common/main/lib/view/SignSettingsDialog.js index 03d43fe5c2..e1fdae68ee 100644 --- a/apps/common/main/lib/view/SignSettingsDialog.js +++ b/apps/common/main/lib/view/SignSettingsDialog.js @@ -41,12 +41,7 @@ if (Common === undefined) var Common = {}; -define([ - 'common/main/lib/util/utils', - 'common/main/lib/component/InputField', - 'common/main/lib/component/CheckBox', - 'common/main/lib/component/Window' -], function () { 'use strict'; +define([], function () { 'use strict'; Common.Views.SignSettingsDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/documenteditor/main/app/controller/DocProtection.js b/apps/documenteditor/main/app/controller/DocProtection.js index 7cd8eb6048..3e64d37481 100644 --- a/apps/documenteditor/main/app/controller/DocProtection.js +++ b/apps/documenteditor/main/app/controller/DocProtection.js @@ -40,8 +40,7 @@ define([ 'core', 'common/main/lib/view/Protection', - 'documenteditor/main/app/view/DocProtection', - 'documenteditor/main/app/view/ProtectDialog' + 'documenteditor/main/app/view/DocProtection' ], function () { 'use strict'; diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index d44ba9e7e9..b78e45f6d2 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -42,7 +42,6 @@ define([ 'core', 'common/main/lib/util/Shortcuts', - 'common/main/lib/view/SaveAsDlg', 'documenteditor/main/app/view/LeftMenu', 'documenteditor/main/app/view/FileMenu', 'documenteditor/main/app/view/ViewTab' diff --git a/apps/documenteditor/main/app/view/CellsAddDialog.js b/apps/documenteditor/main/app/view/CellsAddDialog.js index 0735b07228..3124fcc113 100644 --- a/apps/documenteditor/main/app/view/CellsAddDialog.js +++ b/apps/documenteditor/main/app/view/CellsAddDialog.js @@ -38,12 +38,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/ComboBox', - 'common/main/lib/component/MetricSpinner', - 'common/main/lib/component/RadioBox' -], function () { 'use strict'; +define([], function () { 'use strict'; DE.Views.CellsAddDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 4c47148c5e..fdce47fcf7 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -46,10 +46,7 @@ define([ 'gateway', 'common/main/lib/util/utils', 'common/main/lib/component/Menu', - 'common/main/lib/component/Calendar', - 'documenteditor/main/app/view/NumberingValueDialog', - 'documenteditor/main/app/view/CellsAddDialog', - 'documenteditor/main/app/view/ListIndentsDialog' + 'common/main/lib/component/Calendar' ], function ($, _, Backbone, gateway) { 'use strict'; DE.Views.DocumentHolder = Backbone.View.extend(_.extend({ diff --git a/apps/documenteditor/main/app/view/ListIndentsDialog.js b/apps/documenteditor/main/app/view/ListIndentsDialog.js index 3d7e6bebeb..11d323166e 100644 --- a/apps/documenteditor/main/app/view/ListIndentsDialog.js +++ b/apps/documenteditor/main/app/view/ListIndentsDialog.js @@ -38,10 +38,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/MetricSpinner' -], function () { 'use strict'; +define([], function () { 'use strict'; DE.Views.ListIndentsDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index ee05728145..90da681c13 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -41,7 +41,6 @@ define([ 'backbone', 'common/main/lib/component/Button', 'common/main/lib/component/CheckBox', - 'common/main/lib/view/SaveAsDlg', 'documenteditor/main/app/view/MailMergeEmailDlg' ], function (menuTemplate, $, _, Backbone) { 'use strict'; diff --git a/apps/documenteditor/main/app/view/NumberingValueDialog.js b/apps/documenteditor/main/app/view/NumberingValueDialog.js index 2c4479ed34..66db3b7f25 100644 --- a/apps/documenteditor/main/app/view/NumberingValueDialog.js +++ b/apps/documenteditor/main/app/view/NumberingValueDialog.js @@ -37,10 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/MetricSpinner' -], function () { 'use strict'; +define([], function () { 'use strict'; DE.Views.NumberingValueDialog = Common.UI.Window.extend(_.extend({ options: { diff --git a/apps/documenteditor/main/app/view/ProtectDialog.js b/apps/documenteditor/main/app/view/ProtectDialog.js index 65265ac205..7990219572 100644 --- a/apps/documenteditor/main/app/view/ProtectDialog.js +++ b/apps/documenteditor/main/app/view/ProtectDialog.js @@ -37,9 +37,7 @@ * */ -define([ - 'common/main/lib/component/Window' -], function () { +define([], function () { 'use strict'; DE.Views.ProtectDialog = Common.UI.Window.extend(_.extend({ diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index 156f649e56..6f06de9091 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -210,6 +210,11 @@ require([ 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', + 'common/main/lib/view/PasswordDialog', + 'common/main/lib/view/SignDialog', + 'common/main/lib/view/SignSettingsDialog', + 'common/main/lib/view/SaveAsDlg', + 'documenteditor/main/app/view/ParagraphSettingsAdvanced', 'documenteditor/main/app/view/ImageSettingsAdvanced', 'documenteditor/main/app/view/TableSettingsAdvanced', @@ -240,6 +245,10 @@ require([ 'documenteditor/main/app/view/ListSettingsDialog', 'documenteditor/main/app/view/LineNumbersDialog', 'documenteditor/main/app/view/HyphenationDialog', + 'documenteditor/main/app/view/CellsAddDialog', + 'documenteditor/main/app/view/NumberingValueDialog', + 'documenteditor/main/app/view/ListIndentsDialog', + 'documenteditor/main/app/view/ProtectDialog' ]; window.compareVersions = true; diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js index c326315248..83a7b342ec 100644 --- a/apps/documenteditor/main/app_pack.js +++ b/apps/documenteditor/main/app_pack.js @@ -7,6 +7,11 @@ require([ 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SymbolTableDialog', + 'common/main/lib/view/PasswordDialog', + 'common/main/lib/view/SignDialog', + 'common/main/lib/view/SignSettingsDialog', + 'common/main/lib/view/SaveAsDlg', + 'documenteditor/main/app/view/ParagraphSettingsAdvanced', 'documenteditor/main/app/view/ImageSettingsAdvanced', 'documenteditor/main/app/view/TableSettingsAdvanced', @@ -36,6 +41,10 @@ require([ 'documenteditor/main/app/view/CustomColumnsDialog', 'documenteditor/main/app/view/ListSettingsDialog', 'documenteditor/main/app/view/LineNumbersDialog', - 'documenteditor/main/app/view/HyphenationDialog' + 'documenteditor/main/app/view/HyphenationDialog', + 'documenteditor/main/app/view/CellsAddDialog', + 'documenteditor/main/app/view/NumberingValueDialog', + 'documenteditor/main/app/view/ListIndentsDialog', + 'documenteditor/main/app/view/ProtectDialog' ], function () { });