diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index c5b3d5f9836eaffa2b20cc3e8b78475d290a2767..6d8b865f90e15258efa348866c2ae106575e38d2 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -127,6 +127,10 @@ define([ }, onApiShowPopMenu: function(posX, posY) { + if ($('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) { + return; + } + var me = this, items; diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 71d3bbf677900f1456ccbab540ec9596d9374379..c2c650443e0a65e219d491f5f7c81cf6a1fcdaf6 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -537,7 +537,7 @@ define([ } else { value = 0; } - // me.api.asc_setAutoSaveGap(value); + me.api.asc_setAutoSaveGap(value); if (me.needToUpdateVersion) { Common.NotificationCenter.trigger('api:disconnect'); diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 1ae9666f9828051af6aa5e9441ac7731aa33f758..fc51dc578f6639fcd190e3ee888f296b10da54de 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -95,6 +95,8 @@ define([ }, showModal: function() { + uiApp.closeModal(); + if (Common.SharedSettings.get('phone')) { modalView = uiApp.popup( '<div class="popup settings container-settings">' + diff --git a/apps/spreadsheeteditor/mobile/app/template/Toolbar.template b/apps/spreadsheeteditor/mobile/app/template/Toolbar.template index 2b043110b79001d5a474718224e7adf88d8720dc..f81740d589f4d2d6725cabaa4e21fd7909ead5bf 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/mobile/app/template/Toolbar.template @@ -34,9 +34,11 @@ <a href="#" id="toolbar-add" class="link icon-only" style="display: none;"> <i class="icon icon-plus"></i> </a> + <% if (!phone) { %> <a href="#" id="toolbar-search" class="link icon-only"> <i class="icon icon-search"></i> </a> + <% } %> <a href="#" id="toolbar-settings" class="link icon-only"> <i class="icon icon-settings"></i> </a> diff --git a/apps/spreadsheeteditor/mobile/app/view/Search.js b/apps/spreadsheeteditor/mobile/app/view/Search.js index d22eb1a5c75e56639da0ec58c16cfa93bd33e9a1..0388081ca6bd0a95b305dcd3e5a76d54ed37bb25 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Search.js +++ b/apps/spreadsheeteditor/mobile/app/view/Search.js @@ -91,9 +91,11 @@ define([ showSettings: function (e) { var me = this; + uiApp.closeModal(); + if (Common.SharedSettings.get('phone')) { me.picker = $$(uiApp.popup([ - '<div class="popup">', + '<div class="popup settings">', '<div class="view search-settings-view navbar-through">', _layout.find('#search-settings-view').html(), '</div>',