[DE mobile] Fixed display context menu.
This commit is contained in:
parent
eab5a97e8c
commit
3a035f42db
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -102,6 +102,8 @@ define([
|
|||
},
|
||||
|
||||
showModal: function() {
|
||||
uiApp.closeModal();
|
||||
|
||||
if (Common.SharedSettings.get('phone')) {
|
||||
modalView = uiApp.popup(
|
||||
'<div class="popup settings container-settings">' +
|
||||
|
|
|
@ -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>',
|
||||
|
|
|
@ -242,7 +242,6 @@
|
|||
<div class="navbar-inner">
|
||||
<div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></a></div>
|
||||
<div class="center sliding"><%= scope.textSlideSize %></div>
|
||||
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="page" id="page-settings-setup-view" data-page="settings-setup-view">
|
||||
|
|
Loading…
Reference in a new issue