diff --git a/apps/presentationeditor/mobile/app/controller/DocumentHolder.js b/apps/presentationeditor/mobile/app/controller/DocumentHolder.js index 85ac2b434..ff5fc58be 100644 --- a/apps/presentationeditor/mobile/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/mobile/app/controller/DocumentHolder.js @@ -145,7 +145,8 @@ define([ }, onApiShowPopMenu: function(posX, posY) { - if (_isPopMenuHidden || $('.popover.settings').length > 0 || $('.popup.settings').length > 0) return; + if (_isPopMenuHidden || $('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) + return; var me = this, items; diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js index 8df0f9fc2..9b3cf666e 100644 --- a/apps/presentationeditor/mobile/app/controller/Settings.js +++ b/apps/presentationeditor/mobile/app/controller/Settings.js @@ -101,6 +101,8 @@ define([ }, showModal: function() { + uiApp.closeModal(); + if (Common.SharedSettings.get('phone')) { modalView = uiApp.popup( '