Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix Calculate, Add translations

Browse source
This commit is contained in:
Julia Svinareva 2019-08-27 16:04:21 +03:00
parent 0bc009b7db
commit 3d78494685
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/spreadsheeteditor/main/app/view/FormulaTab.js
View file

@ -58,10 +58,10 @@ define([
me.fireEvent('function:apply', [{name: 'more', origin: 'more'}]); me.fireEvent('function:apply', [{name: 'more', origin: 'more'}]);
}); });
me.btnCalculate.on('click', function () { me.btnCalculate.on('click', function () {
me.fireEvent('function:calculate', [{name: 'calculate', type: Asc.c_oAscCalculateType.All}]); me.fireEvent('function:calculate', [{type: Asc.c_oAscCalculateType.All}]);
}); });
me.btnCalculate.menu.on('item:click', function (menu, item, e) { me.btnCalculate.menu.on('item:click', function (menu, item, e) {
me.fireEvent('function:calculate', [{name: item.caption, type: item.value}]); me.fireEvent('function:calculate', [{type: item.value}]);
}); });
} }
return { return {
@ -227,7 +227,7 @@ define([
split: true, split: true,
menu: true, menu: true,
disabled: true, disabled: true,
lock: [_set.editCell, _set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth] lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
}); });
Common.Utils.injectComponent($host.find('#slot-btn-calculate'), this.btnCalculate); Common.Utils.injectComponent($host.find('#slot-btn-calculate'), this.btnCalculate);
this.lockedControls.push(this.btnCalculate); this.lockedControls.push(this.btnCalculate);

7
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1633,6 +1633,13 @@
"SSE.Views.FormulaTab.txtFormulaTip": "Insert function", "SSE.Views.FormulaTab.txtFormulaTip": "Insert function",
"SSE.Views.FormulaTab.txtMore": "More functions", "SSE.Views.FormulaTab.txtMore": "More functions",
"SSE.Views.FormulaTab.txtRecent": "Recently used", "SSE.Views.FormulaTab.txtRecent": "Recently used",
"SSE.Views.txtCalculate": "Calculate",
"SSE.Views.tipCalculate": "Calculate",
"SSE.Views.textEntireWorkbook": "Entire Workbook",
"SSE.Views.textCurrentSheet": "Current Sheet",
"SSE.Views.textAutomatic": "Automatic",
"SSE.Views.textManual": "Manual",
"SSE.Views.tipCalculateTheEntireWorkbook": "Calculate the entire workbook",
"SSE.Views.GroupDialog.cancelButtonText": "Cancel", "SSE.Views.GroupDialog.cancelButtonText": "Cancel",
"SSE.Views.GroupDialog.okButtonText": "OK", "SSE.Views.GroupDialog.okButtonText": "OK",
"SSE.Views.GroupDialog.textColumns": "Columns", "SSE.Views.GroupDialog.textColumns": "Columns",