diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js
index 21e3523f7..158d3c125 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js
@@ -57,6 +57,12 @@ define([
me.btnFormula.on('click', function(){
me.fireEvent('function:apply', [{name: 'more', origin: 'more'}]);
});
+ me.btnCalculate.on('click', function () {
+ me.fireEvent('function:calculate', [{type: Asc.c_oAscCalculateType.All}]);
+ });
+ me.btnCalculate.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('function:calculate', [{type: item.value}]);
+ });
}
return {
options: {},
@@ -214,6 +220,18 @@ define([
Common.Utils.injectComponent($host.find('#slot-btn-more'), this.btnMore);
this.lockedControls.push(this.btnMore);
+ this.btnCalculate = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-calculation',
+ caption: this.txtCalculation,
+ split: true,
+ menu: true,
+ disabled: true,
+ lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-calculate'), this.btnCalculate);
+ this.lockedControls.push(this.btnCalculate);
+
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
@@ -226,6 +244,17 @@ define([
(new Promise(function (accept, reject) {
accept();
})).then(function(){
+ me.btnCalculate.updateHint([me.tipCalculateTheEntireWorkbook + Common.Utils.String.platformKey('F9'), me.tipCalculate]);
+ var _menu = new Common.UI.Menu({
+ items: [
+ {caption: me.textCalculateWorkbook, value: Asc.c_oAscCalculateType.All},
+ {caption: me.textCalculateCurrentSheet, value: Asc.c_oAscCalculateType.ActiveSheet},
+ //{caption: '--'},
+ //{caption: me.textAutomatic, value: '', toggleGroup: 'menuCalcMode', checkable: true, checked: true},
+ //{caption: me.textManual, value: '', toggleGroup: 'menuCalcMode', checkable: true, checked: false}
+ ]
+ });
+ me.btnCalculate.setMenu(_menu);
setEvents.call(me);
});
},
@@ -480,7 +509,14 @@ define([
txtAdditional: 'Additional',
txtFormula: 'Function',
txtFormulaTip: 'Insert function',
- txtMore: 'More functions'
+ txtMore: 'More functions',
+ txtCalculation: 'Calculation',
+ tipCalculate: 'Calculate',
+ textCalculateWorkbook: 'Calculate workbook',
+ textCalculateCurrentSheet: 'Calculate current sheet',
+ textAutomatic: 'Automatic',
+ textManual: 'Manual',
+ tipCalculateTheEntireWorkbook: 'Calculate the entire workbook'
}
}()), SSE.Views.FormulaTab || {}));
});
diff --git a/apps/spreadsheeteditor/main/app/view/Spellcheck.js b/apps/spreadsheeteditor/main/app/view/Spellcheck.js
index 33d879318..1d6a3ad83 100644
--- a/apps/spreadsheeteditor/main/app/view/Spellcheck.js
+++ b/apps/spreadsheeteditor/main/app/view/Spellcheck.js
@@ -146,7 +146,8 @@ define([
cls : 'input-group-nr',
scroller : {
suppressScrollX: true
- }
+ },
+ search: true
});
this.btnToDictionary = new Common.UI.Button({
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index b644c07c0..ecec32f3e 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -751,6 +751,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "SSE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning",
"SSE.Controllers.Print.txtCustom": "Custom",
@@ -1633,6 +1634,13 @@
"SSE.Views.FormulaTab.txtFormulaTip": "Insert function",
"SSE.Views.FormulaTab.txtMore": "More functions",
"SSE.Views.FormulaTab.txtRecent": "Recently used",
+ "SSE.Views.FormulaTab.txtCalculation": "Calculation",
+ "SSE.Views.FormulaTab.tipCalculate": "Calculate",
+ "SSE.Views.FormulaTab.textCalculateWorkbook": "Calculate workbook",
+ "SSE.Views.FormulaTab.textCalculateCurrentSheet": "Calculate current sheet",
+ "SSE.Views.FormulaTab.textAutomatic": "Automatic",
+ "SSE.Views.FormulaTab.textManual": "Manual",
+ "SSE.Views.FormulaTab.tipCalculateTheEntireWorkbook": "Calculate the entire workbook",
"SSE.Views.GroupDialog.cancelButtonText": "Cancel",
"SSE.Views.GroupDialog.okButtonText": "OK",
"SSE.Views.GroupDialog.textColumns": "Columns",
diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js
index b187c935d..c120d514b 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/Main.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js
@@ -1034,6 +1034,10 @@ define([
config.msg = this.errorFrmlMaxTextLength;
break;
+ case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+ config.msg = this.errorFileSizeExceed;
+ break;
+
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@@ -1615,7 +1619,8 @@ define([
textPaidFeature: 'Paid feature',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.',
errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.
Use the CONCATENATE function or concatenation operator (&)',
- waitText: 'Please, wait...'
+ waitText: 'Please, wait...',
+ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.'
}
})(), SSE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 34b803416..138513d20 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -284,6 +284,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "SSE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.",
"SSE.Controllers.Search.textNoTextFound": "Text not found",
"SSE.Controllers.Search.textReplaceAll": "Replace All",
"SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",