Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE mobile] Fixed display context menu.

Browse source
This commit is contained in:
Alexander Yuzhin 2016-12-23 13:57:23 +03:00
parent eab5a97e8c
commit 3a035f42db
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/app/controller/DocumentHolder.js
View file

@ -134,7 +134,7 @@ define([
}, },
onApiShowPopMenu: function(posX, posY) { onApiShowPopMenu: function(posX, posY) {
if ($('.popover.settings').length > 0) { if ($('.popover.settings, .popup.settings, .picker-modal.settings').length > 0) {
return; return;
} }

2
apps/documenteditor/mobile/app/controller/Settings.js
View file

@ -102,6 +102,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">' +

4
apps/documenteditor/mobile/app/view/Search.js
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>',

1
apps/presentationeditor/mobile/app/template/Settings.template
View file

@ -242,7 +242,6 @@
<div class="navbar-inner"> <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="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="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> </div>
<div class="page" id="page-settings-setup-view" data-page="settings-setup-view"> <div class="page" id="page-settings-setup-view" data-page="settings-setup-view">