[SSE mobile] Fixed display context menu.

This commit is contained in:
Alexander Yuzhin 2016-12-23 14:31:28 +03:00
parent 131cbf1b02
commit 84aab33fe3
5 changed files with 12 additions and 2 deletions

View file

@ -127,6 +127,10 @@ define([
}, },
onApiShowPopMenu: function(posX, posY) { onApiShowPopMenu: function(posX, posY) {
if ($('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) {
return;
}
var me = this, var me = this,
items; items;

View file

@ -537,7 +537,7 @@ define([
} else { } else {
value = 0; value = 0;
} }
// me.api.asc_setAutoSaveGap(value); me.api.asc_setAutoSaveGap(value);
if (me.needToUpdateVersion) { if (me.needToUpdateVersion) {
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');

View file

@ -95,6 +95,8 @@ define([
}, },
showModal: function() { showModal: function() {
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) { if (Common.SharedSettings.get('phone')) {
modalView = uiApp.popup( modalView = uiApp.popup(
'<div class="popup settings container-settings">' + '<div class="popup settings container-settings">' +

View file

@ -34,9 +34,11 @@
<a href="#" id="toolbar-add" class="link icon-only" style="display: none;"> <a href="#" id="toolbar-add" class="link icon-only" style="display: none;">
<i class="icon icon-plus"></i> <i class="icon icon-plus"></i>
</a> </a>
<% if (!phone) { %>
<a href="#" id="toolbar-search" class="link icon-only"> <a href="#" id="toolbar-search" class="link icon-only">
<i class="icon icon-search"></i> <i class="icon icon-search"></i>
</a> </a>
<% } %>
<a href="#" id="toolbar-settings" class="link icon-only"> <a href="#" id="toolbar-settings" class="link icon-only">
<i class="icon icon-settings"></i> <i class="icon icon-settings"></i>
</a> </a>

View file

@ -91,9 +91,11 @@ define([
showSettings: function (e) { showSettings: function (e) {
var me = this; var me = this;
uiApp.closeModal();
if (Common.SharedSettings.get('phone')) { if (Common.SharedSettings.get('phone')) {
me.picker = $$(uiApp.popup([ me.picker = $$(uiApp.popup([
'<div class="popup">', '<div class="popup settings">',
'<div class="view search-settings-view navbar-through">', '<div class="view search-settings-view navbar-through">',
_layout.find('#search-settings-view').html(), _layout.find('#search-settings-view').html(),
'</div>', '</div>',