diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js index da8d230f7..80dcf6bdd 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js @@ -130,12 +130,14 @@ define([ layout: SSE.getController('AddChart').getView('AddChart').rootLayout() }); - if ( !options || options.panel == 'function' ) + if ( !options || options.panel == 'function' ) { + view = SSE.getController('AddFunction').getView('AddFunction'); addViews.push({ caption: me.textFormula, id: 'add-formula', - layout: SSE.getController('AddFunction').getView('AddFunction').rootLayout() + layout: options ? view.rootLayout() : view.layoutPanel() }); + } if ( !options ) addViews.push({ diff --git a/apps/spreadsheeteditor/mobile/app/template/AddFunction.template b/apps/spreadsheeteditor/mobile/app/template/AddFunction.template index ec2a34239..a17ba2bb6 100644 --- a/apps/spreadsheeteditor/mobile/app/template/AddFunction.template +++ b/apps/spreadsheeteditor/mobile/app/template/AddFunction.template @@ -2,38 +2,40 @@ <% if (view == 'root') { %>
-
- -
<%= textGroups %>
-
- +
+
<%= textGroups %>
+
+
- - - <% }; %> - +
diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js index 45d702028..2afcde989 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js @@ -137,6 +137,14 @@ define([ return ''; }, + layoutPage: function () { + return this.layout ? this.layout.find('#add-function-root').html() : ''; + }, + + layoutPanel: function() { + return this.layout ? this.layout.find('#add-function-root .page-content').html() : ''; + }, + initControls: function () { // },