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

[SSE] Fix Bug 33907

Browse source
This commit is contained in:
Alexander Yuzhin 2017-02-07 12:58:35 +03:00
parent e258200a94
commit 01473b7240
2 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
View file

@ -60,6 +60,9 @@ define([
initialize: function () {
var me = this;
Common.NotificationCenter.on('document:ready', _.bind(me.onDocumentReady, me));
this.addListeners({
'FileMenu': {
'settings:apply': function() {
@ -71,32 +74,6 @@ define([
setApi: function (api) {
this.api = api;
if (this.formulasGroups && this.api) {
this.loadingFormulas();
var me = this;
this.formulas = new SSE.Views.FormulaDialog({
api : this.api,
toolclose : 'hide',
formulasGroups : this.formulasGroups,
handler : function (func) {
if (func && me.api) {
me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func);
}
}
});
this.formulas.on({
'hide': function () {
if (me.api) {
me.api.asc_enableKeyEvents(true);
}
}
});
}
return this;
},
@ -109,6 +86,33 @@ define([
this.formulasGroups = this.getApplication().getCollection('FormulaGroups');
},
onDocumentReady: function () {
var me = this;
if (me.formulasGroups && me.api) {
me.loadingFormulas();
me.formulas = new SSE.Views.FormulaDialog({
api : me.api,
toolclose : 'hide',
formulasGroups : me.formulasGroups,
handler : function (func) {
if (func && me.api) {
me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func);
}
}
});
me.formulas.on({
'hide': function () {
if (me.api) {
me.api.asc_enableKeyEvents(true);
}
}
});
}
},
showDialog: function () {
if (this.formulas) {
if (this.needUpdateFormula)

12
apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js
View file

@ -58,7 +58,8 @@ define([
],
initialize: function () {
Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this));
Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this));
Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
this.addListeners({
'AddFunction': {
@ -85,6 +86,15 @@ define([
initEvents: function () {
},
onDocumentReady: function () {
var me = this;
_.defer(function () {
me.api.asc_setLocalization(fc);
me.fillFunctions.call(me);
});
},
fillFunctions: function() {
var functions = {};
var jsonDescr = JSON.parse(fd);