diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 0c32fc416..948cbb4e3 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -594,6 +594,20 @@ Common.Utils.String = new (function() { parseFloat: function(string) { (typeof string === 'string') && (string = string.replace(',', '.')); return parseFloat(string) + }, + + encodeSurrogateChar: function(nUnicode) { + if (nUnicode < 0x10000) + { + return String.fromCharCode(nUnicode); + } + else + { + nUnicode = nUnicode - 0x10000; + var nLeadingChar = 0xD800 | (nUnicode >> 10); + var nTrailingChar = 0xDC00 | (nUnicode & 0x3FF); + return String.fromCharCode(nLeadingChar) + String.fromCharCode(nTrailingChar); + } } } })(); diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js new file mode 100644 index 000000000..d2ef90c61 --- /dev/null +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -0,0 +1,122 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2020 + * + * 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 + * + */ + +/** + * AutoCorrectDialog.js + * + * Created by Julia Radzhabova on 03.07.2020 + * Copyright (c) 2020 Ascensio System SIA. All rights reserved. + * + */ +if (Common === undefined) + var Common = {}; +define([ + 'common/main/lib/component/ListView', + 'common/main/lib/component/Window' +], function () { 'use strict'; + + Common.Views.AutoCorrectDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 448, + cls: 'modal-dlg', + buttons: null + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.textTitle + }, options || {}); + + this.template = [ + '
', + '
', + '', + '', + '', + '', + '', + '', + '', + '
', + '', + '
', + '
', + '
', + '
', + '
', + '
', + '', + '
' + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + this.props = this.options.props || []; + + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + var $window = this.getChild(); + + // special + this.mathList = new Common.UI.ListView({ + el: $window.find('#auto-correct-math-list'), + store: new Common.UI.DataViewStore(this.props), + simpleAddMode: true, + template: _.template(['
'].join('')), + itemTemplate: _.template([ + '
', + '
<%= replaced %>
', + '
<%= by %>
', + '
' + ].join('')), + scrollAlwaysVisible: true + }); + $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + }, + + onBtnClick: function(event) { + this.close(); + }, + + onPrimary: function(event) { + return true; + }, + + textTitle: 'AutoCorrect', + textMathCorrect: 'Math AutoCorrect' + + }, Common.Views.AutoCorrectDialog || {})) +}); diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index f6b7f36e1..1a2a6838e 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -239,6 +239,7 @@ define([ if ( !!this.api ) { this.panels['info'].setApi(this.api); + this.panels['opts'].setApi(this.api); if ( this.panels['protect'] ) this.panels['protect'].setApi(this.api); } @@ -373,6 +374,7 @@ define([ if ( this.rendered ) { this.panels['info'].setApi(api); + this.panels['opts'].setApi(api); if (this.panels['protect']) this.panels['protect'].setApi(api); } diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index ced874565..a3a4ffb8c 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -41,7 +41,8 @@ */ define([ - 'common/main/lib/view/DocumentAccessDialog' + 'common/main/lib/view/DocumentAccessDialog', + 'common/main/lib/view/AutoCorrectDialog' ], function () { 'use strict'; @@ -202,6 +203,10 @@ define([ '', '
', '','', + '', + '', + '', + '','', '', '', '
', @@ -430,6 +435,11 @@ define([ labelText: this.strPasteButton }); + this.btnAutoCorrect = new Common.UI.Button({ + el: $markup.findById('#fms-btn-auto-correct') + }); + this.btnAutoCorrect.on('click', _.bind(this.autoCorrect, this)); + this.btnApply = new Common.UI.Button({ el: $markup.findById('#fms-btn-apply') }); @@ -473,6 +483,11 @@ define([ $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); }, + setApi: function(o) { + this.api = o; + return this; + }, + updateSettings: function() { this.chInputMode.setValue(Common.Utils.InternalSettings.get("de-settings-inputmode")); @@ -593,6 +608,29 @@ define([ this._fontRender = combo.getValue(); }, + autoCorrect: function() { + if (!this._mathCorrect) { + var arr = (this.api) ? this.api.asc_getAutoCorrectMathSymbols() : [], + data = []; + _.each(arr, function(item, index){ + var itm = {replaced: item[0]}; + if (typeof item[1]=='object') { + itm.by = ''; + _.each(item[1], function(ch){ + itm.by += Common.Utils.String.encodeSurrogateChar(ch); + }); + } else { + itm.by = Common.Utils.String.encodeSurrogateChar(item[1]); + } + data.push(itm); + }); + this._mathCorrect = data; + } + (new Common.Views.AutoCorrectDialog({ + props: this._mathCorrect + })).show(); + }, + strLiveComment: 'Turn on option', strInputMode: 'Turn on hieroglyphs', strZoom: 'Default Zoom Value', @@ -642,7 +680,9 @@ define([ txtRunMacrosDesc: 'Enable all macros without notification', txtStopMacrosDesc: 'Disable all macros without notification', strPaste: 'Cut, copy and paste', - strPasteButton: 'Show Paste Options button when content is pasted' + strPasteButton: 'Show Paste Options button when content is pasted', + txtProofing: 'Proofing', + txtAutoCorrect: 'AutoCorrect options...' }, DE.Views.FileMenuPanels.Settings || {})); DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({