Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
3a035f42
Commit
3a035f42
authored
Dec 23, 2016
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Fixed display context menu.
parent
eab5a97e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
apps/documenteditor/mobile/app/controller/DocumentHolder.js
apps/documenteditor/mobile/app/controller/DocumentHolder.js
+1
-1
apps/documenteditor/mobile/app/controller/Settings.js
apps/documenteditor/mobile/app/controller/Settings.js
+2
-0
apps/documenteditor/mobile/app/view/Search.js
apps/documenteditor/mobile/app/view/Search.js
+3
-1
apps/presentationeditor/mobile/app/template/Settings.template
.../presentationeditor/mobile/app/template/Settings.template
+0
-1
No files found.
apps/documenteditor/mobile/app/controller/DocumentHolder.js
View file @
3a035f42
...
...
@@ -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
;
}
...
...
apps/documenteditor/mobile/app/controller/Settings.js
View file @
3a035f42
...
...
@@ -102,6 +102,8 @@ define([
},
showModal
:
function
()
{
uiApp
.
closeModal
();
if
(
Common
.
SharedSettings
.
get
(
'
phone
'
))
{
modalView
=
uiApp
.
popup
(
'
<div class="popup settings container-settings">
'
+
...
...
apps/documenteditor/mobile/app/view/Search.js
View file @
3a035f42
...
...
@@ -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>
'
,
...
...
apps/presentationeditor/mobile/app/template/Settings.template
View file @
3a035f42
...
...
@@ -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">
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment