Merge pull request #418 from ONLYOFFICE/feature/math-correct
Feature/math correct For Bug 44659
This commit is contained in:
commit
2d3441bcf3
|
@ -594,6 +594,20 @@ Common.Utils.String = new (function() {
|
||||||
parseFloat: function(string) {
|
parseFloat: function(string) {
|
||||||
(typeof string === 'string') && (string = string.replace(',', '.'));
|
(typeof string === 'string') && (string = string.replace(',', '.'));
|
||||||
return parseFloat(string)
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|
199
apps/common/main/lib/view/AutoCorrectDialog.js
Normal file
199
apps/common/main/lib/view/AutoCorrectDialog.js
Normal file
|
@ -0,0 +1,199 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* (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 = [
|
||||||
|
'<div class="box">',
|
||||||
|
'<div id="symbol-table-pnl-special">',
|
||||||
|
'<table cols="1" style="width: 100%;">',
|
||||||
|
'<tr>',
|
||||||
|
'<td style="padding-bottom: 8px;">',
|
||||||
|
'<label style="font-weight: bold;">' + this.textMathCorrect + '</label>',
|
||||||
|
'</td>',
|
||||||
|
'</tr>',
|
||||||
|
'<tr>',
|
||||||
|
'<td>',
|
||||||
|
'<label style="width: 117px;">' + this.textReplace + '</label>',
|
||||||
|
'<label>' + this.textBy + '</label>',
|
||||||
|
'</td>',
|
||||||
|
'</tr>',
|
||||||
|
'<tr>',
|
||||||
|
'<td>',
|
||||||
|
'<div id="auto-correct-replace" style="height:22px;width: 115px;margin-right: 2px;display: inline-block;"></div>',
|
||||||
|
'<div id="auto-correct-by" style="height:22px;width: 299px;display: inline-block;"></div>',
|
||||||
|
'</td>',
|
||||||
|
'</tr>',
|
||||||
|
'<tr>',
|
||||||
|
'<td>',
|
||||||
|
'<div id="auto-correct-math-list" class="" style="width:100%; height: 254px;"></div>',
|
||||||
|
'</td>',
|
||||||
|
'</tr>',
|
||||||
|
'</table>',
|
||||||
|
'</div>',
|
||||||
|
'</div>',
|
||||||
|
'<div class="footer center">',
|
||||||
|
'<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
|
||||||
|
'</div>'
|
||||||
|
].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();
|
||||||
|
var me = this;
|
||||||
|
|
||||||
|
// 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(['<div class="listview inner" style=""></div>'].join('')),
|
||||||
|
itemTemplate: _.template([
|
||||||
|
'<div id="<%= id %>" class="list-item" style="pointer-events:none;width: 100%;display:flex;">',
|
||||||
|
'<div style="min-width:110px;padding-right: 5px;"><%= replaced %></div>',
|
||||||
|
'<div style="flex-grow:1;font-family: Cambria Math;font-size:13px;"><%= by %></div>',
|
||||||
|
'</div>'
|
||||||
|
].join('')),
|
||||||
|
scrollAlwaysVisible: true
|
||||||
|
});
|
||||||
|
this.mathList.on('item:select', _.bind(this.onSelectMathItem, this));
|
||||||
|
|
||||||
|
this.inputReplace = new Common.UI.InputField({
|
||||||
|
el : $window.find('#auto-correct-replace'),
|
||||||
|
allowBlank : true,
|
||||||
|
validateOnChange : true,
|
||||||
|
validation : function () { return true; }
|
||||||
|
}).on ('changing', function (input, value) {
|
||||||
|
if (value.length) {
|
||||||
|
var store = me.mathList.store;
|
||||||
|
var _selectedItem = store.find(function(item) {
|
||||||
|
if ( item.get('replaced').indexOf(value) == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (_selectedItem) {
|
||||||
|
me.mathList.selectRecord(_selectedItem, true);
|
||||||
|
me.mathList.scrollToRecord(_selectedItem);
|
||||||
|
} else {
|
||||||
|
me.mathList.deselectAll();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
me.mathList.deselectAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.inputReplace.cmpEl.find('input').on('keydown', function(event){
|
||||||
|
if (event.key == 'ArrowDown') {
|
||||||
|
var _selectedItem = me.mathList.getSelectedRec() || me.mathList.store.at(0);
|
||||||
|
if (_selectedItem) {
|
||||||
|
me.mathList.selectRecord(_selectedItem);
|
||||||
|
me.mathList.scrollToRecord(_selectedItem);
|
||||||
|
}
|
||||||
|
_.delay(function(){
|
||||||
|
me.mathList.cmpEl.find('.listview').focus();
|
||||||
|
},10);
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.inputBy = new Common.UI.InputField({
|
||||||
|
el : $window.find('#auto-correct-by'),
|
||||||
|
allowBlank : true,
|
||||||
|
validateOnChange : true,
|
||||||
|
validation : function () { return true; }
|
||||||
|
});
|
||||||
|
// this.inputBy.cmpEl.find('input').css('font-size', '13px');
|
||||||
|
|
||||||
|
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
|
||||||
|
},
|
||||||
|
|
||||||
|
onSelectMathItem: function(lisvView, itemView, record) {
|
||||||
|
this.inputReplace.setValue(record.get('replaced'));
|
||||||
|
this.inputBy.setValue(record.get('by'));
|
||||||
|
},
|
||||||
|
|
||||||
|
show: function() {
|
||||||
|
Common.UI.Window.prototype.show.apply(this, arguments);
|
||||||
|
|
||||||
|
var me = this;
|
||||||
|
_.delay(function(){
|
||||||
|
$('input', me.inputReplace.cmpEl).select().focus();
|
||||||
|
},100);
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnClick: function(event) {
|
||||||
|
this.close();
|
||||||
|
},
|
||||||
|
|
||||||
|
onPrimary: function(event) {
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
textTitle: 'AutoCorrect',
|
||||||
|
textMathCorrect: 'Math AutoCorrect',
|
||||||
|
textReplace: 'Replace:',
|
||||||
|
textBy: 'By:'
|
||||||
|
|
||||||
|
}, Common.Views.AutoCorrectDialog || {}))
|
||||||
|
});
|
|
@ -239,6 +239,7 @@ define([
|
||||||
|
|
||||||
if ( !!this.api ) {
|
if ( !!this.api ) {
|
||||||
this.panels['info'].setApi(this.api);
|
this.panels['info'].setApi(this.api);
|
||||||
|
if (this.panels['opts']) this.panels['opts'].setApi(this.api);
|
||||||
if ( this.panels['protect'] )
|
if ( this.panels['protect'] )
|
||||||
this.panels['protect'].setApi(this.api);
|
this.panels['protect'].setApi(this.api);
|
||||||
}
|
}
|
||||||
|
@ -373,6 +374,7 @@ define([
|
||||||
|
|
||||||
if ( this.rendered ) {
|
if ( this.rendered ) {
|
||||||
this.panels['info'].setApi(api);
|
this.panels['info'].setApi(api);
|
||||||
|
if (this.panels['opts']) this.panels['opts'].setApi(api);
|
||||||
if (this.panels['protect']) this.panels['protect'].setApi(api);
|
if (this.panels['protect']) this.panels['protect'].setApi(api);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define([
|
define([
|
||||||
'common/main/lib/view/DocumentAccessDialog'
|
'common/main/lib/view/DocumentAccessDialog',
|
||||||
|
'common/main/lib/view/AutoCorrectDialog'
|
||||||
], function () {
|
], function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
@ -202,6 +203,10 @@ define([
|
||||||
'<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
|
'<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
|
||||||
'<td class="right"><div id="fms-chb-spell-check"></div></td>',
|
'<td class="right"><div id="fms-chb-spell-check"></div></td>',
|
||||||
'</tr>','<tr class="divider edit"></tr>',
|
'</tr>','<tr class="divider edit"></tr>',
|
||||||
|
'<tr class="edit">',
|
||||||
|
'<td class="left"><label><%= scope.txtProofing %></label></td>',
|
||||||
|
'<td class="right"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;"><%= scope.txtAutoCorrect %></button></div></td>',
|
||||||
|
'</tr>','<tr class="divider edit"></tr>',
|
||||||
'<tr class="edit">',
|
'<tr class="edit">',
|
||||||
'<td class="left"><label><%= scope.txtInput %></label></td>',
|
'<td class="left"><label><%= scope.txtInput %></label></td>',
|
||||||
'<td class="right"><div id="fms-chb-input-mode"></div></td>',
|
'<td class="right"><div id="fms-chb-input-mode"></div></td>',
|
||||||
|
@ -430,6 +435,11 @@ define([
|
||||||
labelText: this.strPasteButton
|
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({
|
this.btnApply = new Common.UI.Button({
|
||||||
el: $markup.findById('#fms-btn-apply')
|
el: $markup.findById('#fms-btn-apply')
|
||||||
});
|
});
|
||||||
|
@ -473,6 +483,11 @@ define([
|
||||||
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
|
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
setApi: function(o) {
|
||||||
|
this.api = o;
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
|
||||||
updateSettings: function() {
|
updateSettings: function() {
|
||||||
this.chInputMode.setValue(Common.Utils.InternalSettings.get("de-settings-inputmode"));
|
this.chInputMode.setValue(Common.Utils.InternalSettings.get("de-settings-inputmode"));
|
||||||
|
|
||||||
|
@ -593,6 +608,29 @@ define([
|
||||||
this._fontRender = combo.getValue();
|
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',
|
strLiveComment: 'Turn on option',
|
||||||
strInputMode: 'Turn on hieroglyphs',
|
strInputMode: 'Turn on hieroglyphs',
|
||||||
strZoom: 'Default Zoom Value',
|
strZoom: 'Default Zoom Value',
|
||||||
|
@ -642,7 +680,9 @@ define([
|
||||||
txtRunMacrosDesc: 'Enable all macros without notification',
|
txtRunMacrosDesc: 'Enable all macros without notification',
|
||||||
txtStopMacrosDesc: 'Disable all macros without notification',
|
txtStopMacrosDesc: 'Disable all macros without notification',
|
||||||
strPaste: 'Cut, copy and paste',
|
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.Settings || {}));
|
||||||
|
|
||||||
DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
||||||
|
|
|
@ -157,6 +157,10 @@
|
||||||
"Common.Views.About.txtPoweredBy": "Powered by",
|
"Common.Views.About.txtPoweredBy": "Powered by",
|
||||||
"Common.Views.About.txtTel": "tel.: ",
|
"Common.Views.About.txtTel": "tel.: ",
|
||||||
"Common.Views.About.txtVersion": "Version ",
|
"Common.Views.About.txtVersion": "Version ",
|
||||||
|
"Common.Views.AutoCorrectDialog.textTitle": "AutoCorrect",
|
||||||
|
"Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect",
|
||||||
|
"Common.Views.AutoCorrectDialog.textReplace": "Replace:",
|
||||||
|
"Common.Views.AutoCorrectDialog.textBy": "By:",
|
||||||
"Common.Views.Chat.textSend": "Send",
|
"Common.Views.Chat.textSend": "Send",
|
||||||
"Common.Views.Comments.textAdd": "Add",
|
"Common.Views.Comments.textAdd": "Add",
|
||||||
"Common.Views.Comments.textAddComment": "Add Comment",
|
"Common.Views.Comments.textAddComment": "Add Comment",
|
||||||
|
@ -1581,6 +1585,8 @@
|
||||||
"DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without notification",
|
"DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without notification",
|
||||||
"DE.Views.FileMenuPanels.Settings.strPaste": "Cut, copy and paste",
|
"DE.Views.FileMenuPanels.Settings.strPaste": "Cut, copy and paste",
|
||||||
"DE.Views.FileMenuPanels.Settings.strPasteButton": "Show Paste Options button when content is pasted",
|
"DE.Views.FileMenuPanels.Settings.strPasteButton": "Show Paste Options button when content is pasted",
|
||||||
|
"DE.Views.FileMenuPanels.Settings.txtProofing": "Proofing",
|
||||||
|
"DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "AutoCorrect options...",
|
||||||
"DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center",
|
"DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center",
|
||||||
"DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left",
|
"DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left",
|
||||||
"DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page",
|
"DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page",
|
||||||
|
|
|
@ -223,6 +223,7 @@ define([
|
||||||
|
|
||||||
if ( !!this.api ) {
|
if ( !!this.api ) {
|
||||||
this.panels['info'].setApi(this.api);
|
this.panels['info'].setApi(this.api);
|
||||||
|
if (this.panels['opts']) this.panels['opts'].setApi(this.api);
|
||||||
if ( this.panels['protect'] )
|
if ( this.panels['protect'] )
|
||||||
this.panels['protect'].setApi(this.api);
|
this.panels['protect'].setApi(this.api);
|
||||||
}
|
}
|
||||||
|
@ -352,6 +353,7 @@ define([
|
||||||
|
|
||||||
if ( this.rendered ) {
|
if ( this.rendered ) {
|
||||||
this.panels['info'].setApi(api);
|
this.panels['info'].setApi(api);
|
||||||
|
if (this.panels['opts']) this.panels['opts'].setApi(api);
|
||||||
if (this.panels['protect']) this.panels['protect'].setApi(api);
|
if (this.panels['protect']) this.panels['protect'].setApi(api);
|
||||||
}
|
}
|
||||||
this.api.asc_registerCallback('asc_onDocumentName', _.bind(this.onDocumentName, this));
|
this.api.asc_registerCallback('asc_onDocumentName', _.bind(this.onDocumentName, this));
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
|
|
||||||
define([
|
define([
|
||||||
'common/main/lib/view/DocumentAccessDialog',
|
'common/main/lib/view/DocumentAccessDialog',
|
||||||
|
'common/main/lib/view/AutoCorrectDialog',
|
||||||
'common/main/lib/component/CheckBox'
|
'common/main/lib/component/CheckBox'
|
||||||
], function () {
|
], function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
@ -184,6 +185,10 @@ define([
|
||||||
'<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
|
'<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
|
||||||
'<td class="right"><div id="fms-chb-spell-check"></div></td>',
|
'<td class="right"><div id="fms-chb-spell-check"></div></td>',
|
||||||
'</tr>','<tr class="divider edit"></tr>',
|
'</tr>','<tr class="divider edit"></tr>',
|
||||||
|
'<tr class="edit">',
|
||||||
|
'<td class="left"><label><%= scope.txtProofing %></label></td>',
|
||||||
|
'<td class="right"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;"><%= scope.txtAutoCorrect %></button></div></td>',
|
||||||
|
'</tr>','<tr class="divider edit"></tr>',
|
||||||
'<tr class="edit">',
|
'<tr class="edit">',
|
||||||
'<td class="left"><label><%= scope.txtInput %></label></td>',
|
'<td class="left"><label><%= scope.txtInput %></label></td>',
|
||||||
'<td class="right"><div id="fms-chb-input-mode"></div></td>',
|
'<td class="right"><div id="fms-chb-input-mode"></div></td>',
|
||||||
|
@ -373,6 +378,11 @@ define([
|
||||||
labelText: this.strPasteButton
|
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({
|
this.btnApply = new Common.UI.Button({
|
||||||
el: $markup.findById('#fms-btn-apply')
|
el: $markup.findById('#fms-btn-apply')
|
||||||
});
|
});
|
||||||
|
@ -414,6 +424,11 @@ define([
|
||||||
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
|
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
setApi: function(o) {
|
||||||
|
this.api = o;
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
|
||||||
updateSettings: function() {
|
updateSettings: function() {
|
||||||
this.chSpell.setValue(Common.Utils.InternalSettings.get("pe-settings-spellcheck"));
|
this.chSpell.setValue(Common.Utils.InternalSettings.get("pe-settings-spellcheck"));
|
||||||
|
|
||||||
|
@ -506,6 +521,29 @@ define([
|
||||||
this._fontRender = combo.getValue();
|
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();
|
||||||
|
},
|
||||||
|
|
||||||
strInputMode: 'Turn on hieroglyphs',
|
strInputMode: 'Turn on hieroglyphs',
|
||||||
strZoom: 'Default Zoom Value',
|
strZoom: 'Default Zoom Value',
|
||||||
okButtonText: 'Apply',
|
okButtonText: 'Apply',
|
||||||
|
@ -549,7 +587,9 @@ define([
|
||||||
txtRunMacrosDesc: 'Enable all macros without notification',
|
txtRunMacrosDesc: 'Enable all macros without notification',
|
||||||
txtStopMacrosDesc: 'Disable all macros without notification',
|
txtStopMacrosDesc: 'Disable all macros without notification',
|
||||||
strPaste: 'Cut, copy and paste',
|
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...'
|
||||||
}, PE.Views.FileMenuPanels.Settings || {}));
|
}, PE.Views.FileMenuPanels.Settings || {}));
|
||||||
|
|
||||||
PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
"Common.Views.About.txtPoweredBy": "Powered by",
|
"Common.Views.About.txtPoweredBy": "Powered by",
|
||||||
"Common.Views.About.txtTel": "tel.: ",
|
"Common.Views.About.txtTel": "tel.: ",
|
||||||
"Common.Views.About.txtVersion": "Version ",
|
"Common.Views.About.txtVersion": "Version ",
|
||||||
|
"Common.Views.AutoCorrectDialog.textTitle": "AutoCorrect",
|
||||||
|
"Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect",
|
||||||
|
"Common.Views.AutoCorrectDialog.textReplace": "Replace:",
|
||||||
|
"Common.Views.AutoCorrectDialog.textBy": "By:",
|
||||||
"Common.Views.Chat.textSend": "Send",
|
"Common.Views.Chat.textSend": "Send",
|
||||||
"Common.Views.Comments.textAdd": "Add",
|
"Common.Views.Comments.textAdd": "Add",
|
||||||
"Common.Views.Comments.textAddComment": "Add Comment",
|
"Common.Views.Comments.textAddComment": "Add Comment",
|
||||||
|
@ -1274,6 +1278,8 @@
|
||||||
"PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without notification",
|
"PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without notification",
|
||||||
"PE.Views.FileMenuPanels.Settings.strPaste": "Cut, copy and paste",
|
"PE.Views.FileMenuPanels.Settings.strPaste": "Cut, copy and paste",
|
||||||
"PE.Views.FileMenuPanels.Settings.strPasteButton": "Show Paste Options button when content is pasted",
|
"PE.Views.FileMenuPanels.Settings.strPasteButton": "Show Paste Options button when content is pasted",
|
||||||
|
"PE.Views.FileMenuPanels.Settings.txtProofing": "Proofing",
|
||||||
|
"PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "AutoCorrect options...",
|
||||||
"PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
|
"PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
|
||||||
"PE.Views.HeaderFooterDialog.applyText": "Apply",
|
"PE.Views.HeaderFooterDialog.applyText": "Apply",
|
||||||
"PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'",
|
"PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'",
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
define([
|
define([
|
||||||
'common/main/lib/view/DocumentAccessDialog'
|
'common/main/lib/view/DocumentAccessDialog',
|
||||||
|
'common/main/lib/view/AutoCorrectDialog'
|
||||||
], function () {
|
], function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
@ -257,6 +258,7 @@ define([
|
||||||
|
|
||||||
setApi: function(api) {
|
setApi: function(api) {
|
||||||
this.generalSettings && this.generalSettings.setApi(api);
|
this.generalSettings && this.generalSettings.setApi(api);
|
||||||
|
this.spellcheckSettings && this.spellcheckSettings.setApi(api);
|
||||||
},
|
},
|
||||||
|
|
||||||
txtGeneral: 'General',
|
txtGeneral: 'General',
|
||||||
|
@ -1237,6 +1239,10 @@ define([
|
||||||
'<td class="left"></td>',
|
'<td class="left"></td>',
|
||||||
'<td class="right"><span id="fms-chb-ignore-numbers-words"></span></td>',
|
'<td class="right"><span id="fms-chb-ignore-numbers-words"></span></td>',
|
||||||
'</tr>','<tr class="divider"></tr>',
|
'</tr>','<tr class="divider"></tr>',
|
||||||
|
'<tr>',
|
||||||
|
'<td class="left"><label><%= scope.txtProofing %></label></td>',
|
||||||
|
'<td class="right"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;"><%= scope.txtAutoCorrect %></button></div></td>',
|
||||||
|
'</tr>','<tr class="divider"></tr>',
|
||||||
'<tr>',
|
'<tr>',
|
||||||
'<td class="left"></td>',
|
'<td class="left"></td>',
|
||||||
'<td class="right"><button id="fms-spellcheck-btn-apply" class="btn normal dlg-btn primary"><%= scope.okButtonText %></button></td>',
|
'<td class="right"><button id="fms-spellcheck-btn-apply" class="btn normal dlg-btn primary"><%= scope.okButtonText %></button></td>',
|
||||||
|
@ -1272,6 +1278,11 @@ define([
|
||||||
menuStyle: 'min-width: 267px; max-height: 209px;'
|
menuStyle: 'min-width: 267px; max-height: 209px;'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
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({
|
this.btnApply = new Common.UI.Button({
|
||||||
el: $markup.findById('#fms-spellcheck-btn-apply')
|
el: $markup.findById('#fms-spellcheck-btn-apply')
|
||||||
});
|
});
|
||||||
|
@ -1362,11 +1373,35 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
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();
|
||||||
|
},
|
||||||
|
|
||||||
strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
|
strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
|
||||||
strIgnoreWordsWithNumbers: 'Ignore words with numbers',
|
strIgnoreWordsWithNumbers: 'Ignore words with numbers',
|
||||||
strDictionaryLanguage: 'Dictionary language',
|
strDictionaryLanguage: 'Dictionary language',
|
||||||
okButtonText: 'Apply'
|
okButtonText: 'Apply',
|
||||||
|
txtProofing: 'Proofing',
|
||||||
|
txtAutoCorrect: 'AutoCorrect options...'
|
||||||
}, SSE.Views.FileMenuPanels.MainSpellCheckSettings || {}));
|
}, SSE.Views.FileMenuPanels.MainSpellCheckSettings || {}));
|
||||||
|
|
||||||
SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
|
||||||
|
|
|
@ -59,6 +59,10 @@
|
||||||
"Common.Views.About.txtPoweredBy": "Powered by",
|
"Common.Views.About.txtPoweredBy": "Powered by",
|
||||||
"Common.Views.About.txtTel": "tel.: ",
|
"Common.Views.About.txtTel": "tel.: ",
|
||||||
"Common.Views.About.txtVersion": "Version ",
|
"Common.Views.About.txtVersion": "Version ",
|
||||||
|
"Common.Views.AutoCorrectDialog.textTitle": "AutoCorrect",
|
||||||
|
"Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect",
|
||||||
|
"Common.Views.AutoCorrectDialog.textReplace": "Replace:",
|
||||||
|
"Common.Views.AutoCorrectDialog.textBy": "By:",
|
||||||
"Common.Views.Chat.textSend": "Send",
|
"Common.Views.Chat.textSend": "Send",
|
||||||
"Common.Views.Comments.textAdd": "Add",
|
"Common.Views.Comments.textAdd": "Add",
|
||||||
"Common.Views.Comments.textAddComment": "Add Comment",
|
"Common.Views.Comments.textAddComment": "Add Comment",
|
||||||
|
@ -1726,6 +1730,8 @@
|
||||||
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Dictionary language",
|
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Dictionary language",
|
||||||
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignore words in UPPERCASE",
|
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignore words in UPPERCASE",
|
||||||
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsWithNumbers": "Ignore words with numbers",
|
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsWithNumbers": "Ignore words with numbers",
|
||||||
|
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtProofing": "Proofing",
|
||||||
|
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtAutoCorrect": "AutoCorrect options...",
|
||||||
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
|
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
|
||||||
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",
|
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",
|
||||||
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet",
|
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet",
|
||||||
|
|
Loading…
Reference in a new issue