diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js index b74c56921..45b6d6495 100644 --- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js @@ -134,7 +134,7 @@ define([ }, onApiShowPopMenu: function(posX, posY) { - if ($('.popover.settings').length > 0) { + if ($('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) { return; } diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index 371a26c45..615ae3c31 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -102,6 +102,8 @@ define([ }, showModal: function() { + uiApp.closeModal(); + if (Common.SharedSettings.get('phone')) { modalView = uiApp.popup( '