diff --git a/apps/common/main/lib/component/FocusManager.js b/apps/common/main/lib/component/FocusManager.js index 4c5057d81..1557905d1 100644 --- a/apps/common/main/lib/component/FocusManager.js +++ b/apps/common/main/lib/component/FocusManager.js @@ -199,7 +199,7 @@ Common.UI.FocusManager2 = new(function() { var _add = function(e, fields) { if (e && e.cid) { if (_windows[e.cid]) { - _windows[e.cid].fields.concat(register(fields)); + _windows[e.cid].fields = (_windows[e.cid].fields || []).concat(register(fields)); } else { _windows[e.cid] = { parent: e, diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js index d69c34142..1fdfa4ebf 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js @@ -46,8 +46,7 @@ define([ SSE.Views.FormulaWizard = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 580, - height: 397, - focusManager: true + height: 397 }, initialize : function(options) { @@ -283,7 +282,7 @@ define([ me.args[argcount].lblName.html(me.args[argcount].argName); me.args[argcount].lblValue.html('= '+ ( argres!==null && argres!==undefined ? argres : '' + me.args[argcount].argTypeName + '')); - this.focusManager.add(txt._input); + Common.UI.FocusManager2.add(this, txt); }, onInputChanging: function(input, newValue, oldValue, e) {