diff --git a/apps/presentationeditor/main/app/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js similarity index 98% rename from apps/presentationeditor/main/app/view/ListSettingsDialog.js rename to apps/common/main/lib/view/ListSettingsDialog.js index ffde97be3..4c0cba823 100644 --- a/apps/presentationeditor/main/app/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -39,14 +39,17 @@ * */ +if (Common === undefined) + var Common = {}; + define([ - 'common/main/lib/component/Window', + '../component/Window', 'common/main/lib/component/MetricSpinner', 'common/main/lib/component/ThemeColorPalette', 'common/main/lib/component/ColorButton' ], function () { 'use strict'; - PE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ + Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ options: { type: 0, // 0 - markers, 1 - numbers width: 230, @@ -235,5 +238,5 @@ define([ txtOfText: '% of text', textNewColor: 'Add New Custom Color', txtStart: 'Start at' - }, PE.Views.ListSettingsDialog || {})) + }, Common.Views.ListSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 3b30b425a..54e414d37 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -48,6 +48,7 @@ define([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SelectFileDlg', + 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/util/define', 'presentationeditor/main/app/collection/SlideThemes', 'presentationeditor/main/app/view/Toolbar', @@ -55,8 +56,7 @@ define([ 'presentationeditor/main/app/view/HeaderFooterDialog', 'presentationeditor/main/app/view/HyperlinkSettingsDialog', 'presentationeditor/main/app/view/SlideSizeSettings', - 'presentationeditor/main/app/view/SlideshowSettings', - 'presentationeditor/main/app/view/ListSettingsDialog' + 'presentationeditor/main/app/view/SlideshowSettings' ], function () { 'use strict'; PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ @@ -1111,7 +1111,7 @@ define([ } } if (props) { - (new PE.Views.ListSettingsDialog({ + (new Common.Views.ListSettingsDialog({ props: props, type: type, handler: function(result, value) { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index bedcf8fbc..4fdf6ab78 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -108,6 +108,12 @@ "Common.Views.InsertTableDialog.txtTitle": "Table Size", "Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell", "Common.Views.LanguageDialog.labelSelect": "Select document language", + "Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "Common.Views.ListSettingsDialog.txtColor": "Color", + "Common.Views.ListSettingsDialog.txtOfText": "% of text", + "Common.Views.ListSettingsDialog.txtSize": "Size", + "Common.Views.ListSettingsDialog.txtStart": "Start at", + "Common.Views.ListSettingsDialog.txtTitle": "List Settings", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.", @@ -1286,12 +1292,6 @@ "PE.Views.LeftMenu.tipTitles": "Titles", "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE", "PE.Views.LeftMenu.txtTrial": "TRIAL MODE", - "PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", - "PE.Views.ListSettingsDialog.txtColor": "Color", - "PE.Views.ListSettingsDialog.txtOfText": "% of text", - "PE.Views.ListSettingsDialog.txtSize": "Size", - "PE.Views.ListSettingsDialog.txtStart": "Start at", - "PE.Views.ListSettingsDialog.txtTitle": "List Settings", "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing", "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "PE.Views.ParagraphSettings.strSpacingAfter": "After", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 89f741143..60b5e5747 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -108,6 +108,11 @@ "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы", "Common.Views.InsertTableDialog.txtTitleSplit": "Разделить ячейку", "Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа", + "Common.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", + "Common.Views.ListSettingsDialog.txtColor": "Цвет", + "Common.Views.ListSettingsDialog.txtOfText": "% текста", + "Common.Views.ListSettingsDialog.txtSize": "Размер", + "Common.Views.ListSettingsDialog.txtTitle": "Параметры списка", "Common.Views.OpenDialog.closeButtonText": "Закрыть файл", "Common.Views.OpenDialog.txtEncoding": "Кодировка", "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.", @@ -1285,11 +1290,6 @@ "PE.Views.LeftMenu.tipTitles": "Заголовки", "PE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", "PE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ", - "PE.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", - "PE.Views.ListSettingsDialog.txtColor": "Цвет", - "PE.Views.ListSettingsDialog.txtOfText": "% текста", - "PE.Views.ListSettingsDialog.txtSize": "Размер", - "PE.Views.ListSettingsDialog.txtTitle": "Параметры списка", "PE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", "PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "PE.Views.ParagraphSettings.strSpacingAfter": "После",