From a8325910b728123030d2410be98f9bb29c7363bd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 15 Oct 2020 15:37:48 +0300 Subject: [PATCH] [DE] Use OptionsDialog --- .../main/lib/controller/ReviewChanges.js | 28 +++- apps/common/main/lib/view/OptionsDialog.js | 3 + .../main/app/controller/Toolbar.js | 1 - .../main/app/view/CompareSettingsDialog.js | 150 ------------------ apps/documenteditor/main/locale/en.json | 12 +- 5 files changed, 31 insertions(+), 163 deletions(-) delete mode 100644 apps/documenteditor/main/app/view/CompareSettingsDialog.js diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 3018058b3..4c663a01a 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -48,7 +48,8 @@ define([ 'common/main/lib/collection/ReviewChanges', 'common/main/lib/view/ReviewChanges', 'common/main/lib/view/ReviewPopover', - 'common/main/lib/view/LanguageDialog' + 'common/main/lib/view/LanguageDialog', + 'common/main/lib/view/OptionsDialog' ], function () { 'use strict'; @@ -630,13 +631,19 @@ define([ }).show(); } } else if (item === 'settings') { - (new DE.Views.CompareSettingsDialog({ - props: me._state.compareSettings, - handler: function(result, value) { - if (result == 'ok') { - me._state.compareSettings = value; + var value = me._state.compareSettings ? me._state.compareSettings.getWords() : true; + (new Common.Views.OptionsDialog({ + title: me.textTitleComparison, + items: [ + {caption: me.textChar, value: false, checked: (value===false)}, + {caption: me.textWord, value: true, checked: (value!==false)} + ], + label: me.textShow, + handler: function (dlg, result) { + if (result=='ok') { + me._state.compareSettings = new AscCommonWord.ComparisonOptions(); + me._state.compareSettings.putWords(dlg.getSettings()); } - Common.NotificationCenter.trigger('edit:complete', me.toolbar); } })).show(); @@ -964,6 +971,11 @@ define([ textParaMoveFromUp: 'Moved Up:', textParaMoveFromDown: 'Moved Down:', textUrl: 'Paste a document URL', - textAcceptBeforeCompare: 'In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?' + textAcceptBeforeCompare: 'In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?', + textTitleComparison: 'Comparison Settings', + textShow: 'Show changes at', + textChar: 'Character level', + textWord: 'Word level' + }, Common.Controllers.ReviewChanges || {})); }); \ No newline at end of file diff --git a/apps/common/main/lib/view/OptionsDialog.js b/apps/common/main/lib/view/OptionsDialog.js index 445fabf29..183745111 100644 --- a/apps/common/main/lib/view/OptionsDialog.js +++ b/apps/common/main/lib/view/OptionsDialog.js @@ -57,6 +57,9 @@ define([ this.template = [ '
', + '<% if (typeof label !== "undefined" && label !=="") { %>', + '', + '<% } %>', '<% _.each(items, function(item, index) { %>', '<% if (!item.id) item.id = Common.UI.getId(); %>', '
', diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 49da71c50..6f8025a92 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -58,7 +58,6 @@ define([ 'documenteditor/main/app/view/CustomColumnsDialog', 'documenteditor/main/app/view/ControlSettingsDialog', 'documenteditor/main/app/view/WatermarkSettingsDialog', - 'documenteditor/main/app/view/CompareSettingsDialog', 'documenteditor/main/app/view/ListSettingsDialog', 'documenteditor/main/app/view/DateTimeDialog', 'documenteditor/main/app/view/LineNumbersDialog' diff --git a/apps/documenteditor/main/app/view/CompareSettingsDialog.js b/apps/documenteditor/main/app/view/CompareSettingsDialog.js deleted file mode 100644 index d7c9f84ba..000000000 --- a/apps/documenteditor/main/app/view/CompareSettingsDialog.js +++ /dev/null @@ -1,150 +0,0 @@ -/* - * - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ - -/** - * CompareSettingsDialog.js.js - * - * Created by Julia Radzhabova on 14.08.2019 - * Copyright (c) 2019 Ascensio System SIA. All rights reserved. - * - */ - -define([ - 'common/main/lib/util/utils', - 'common/main/lib/component/CheckBox', - 'common/main/lib/component/InputField', - 'common/main/lib/view/AdvancedSettingsWindow' -], function () { 'use strict'; - - DE.Views.CompareSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ - options: { - contentWidth: 220, - height: 160 - }, - - initialize : function(options) { - var me = this; - - _.extend(this.options, { - title: this.textTitle, - template: [ - '
', - '
', - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', - '', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
' - ].join('') - }, options); - - this.handler = options.handler; - this.props = options.props; - - Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); - }, - - render: function() { - Common.Views.AdvancedSettingsWindow.prototype.render.call(this); - var me = this; - - this.radioChar = new Common.UI.RadioBox({ - el: $('#compare-settings-radio-char'), - labelText: this.textChar, - name: 'asc-radio-compare-show' - }); - - this.radioWord = new Common.UI.RadioBox({ - el: $('#compare-settings-radio-word'), - labelText: this.textWord, - name: 'asc-radio-compare-show' - }); - - this.afterRender(); - }, - - afterRender: function() { - this._setDefaults(this.props); - }, - - show: function() { - Common.Views.AdvancedSettingsWindow.prototype.show.apply(this, arguments); - }, - - _setDefaults: function (props) { - if (props) { - var value = props.getWords(); - (value==false) ? this.radioChar.setValue(true, true) : this.radioWord.setValue(true, true); - } - }, - - getSettings: function () { - var props = new AscCommonWord.ComparisonOptions(); - props.putWords(this.radioWord.getValue()); - return props; - }, - - onDlgBtnClick: function(event) { - var me = this; - var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event; - if (state == 'ok') { - this.handler && this.handler.call(this, state, this.getSettings()); - Common.localStorage.setBool("de-compare-char", this.radioChar.getValue()); - } - - this.close(); - }, - - textTitle: 'Comparison Settings', - textShow: 'Show changes at', - textChar: 'Character level', - textWord: 'Word level' - - }, DE.Views.CompareSettingsDialog || {})) -}); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 684de3619..398f4309d 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -71,6 +71,10 @@ "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textUrl": "Paste a document URL", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.Controllers.ReviewChanges.textChar": "Character level", + "Common.Controllers.ReviewChanges.textShow": "Show changes at", + "Common.Controllers.ReviewChanges.textTitleComparison": "Comparison Settings", + "Common.Controllers.ReviewChanges.textWord": "Word level", "Common.define.chartData.textArea": "Area", "Common.define.chartData.textBar": "Bar", "Common.define.chartData.textCharts": "Charts", @@ -1187,10 +1191,10 @@ "DE.Views.ChartSettings.txtTight": "Tight", "DE.Views.ChartSettings.txtTitle": "Chart", "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom", - "DE.Views.CompareSettingsDialog.textChar": "Character level", - "DE.Views.CompareSettingsDialog.textShow": "Show changes at", - "DE.Views.CompareSettingsDialog.textTitle": "Comparison Settings", - "DE.Views.CompareSettingsDialog.textWord": "Word level", + "del_DE.Views.CompareSettingsDialog.textChar": "Character level", + "del_DE.Views.CompareSettingsDialog.textShow": "Show changes at", + "del_DE.Views.CompareSettingsDialog.textTitle": "Comparison Settings", + "del_DE.Views.CompareSettingsDialog.textWord": "Word level", "DE.Views.ControlSettingsDialog.strGeneral": "General", "DE.Views.ControlSettingsDialog.textAdd": "Add", "DE.Views.ControlSettingsDialog.textAppearance": "Appearance",