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
84aab33f
Commit
84aab33f
authored
Dec 23, 2016
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE mobile] Fixed display context menu.
parent
131cbf1b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
2 deletions
+12
-2
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
...spreadsheeteditor/mobile/app/controller/DocumentHolder.js
+4
-0
apps/spreadsheeteditor/mobile/app/controller/Main.js
apps/spreadsheeteditor/mobile/app/controller/Main.js
+1
-1
apps/spreadsheeteditor/mobile/app/controller/Settings.js
apps/spreadsheeteditor/mobile/app/controller/Settings.js
+2
-0
apps/spreadsheeteditor/mobile/app/template/Toolbar.template
apps/spreadsheeteditor/mobile/app/template/Toolbar.template
+2
-0
apps/spreadsheeteditor/mobile/app/view/Search.js
apps/spreadsheeteditor/mobile/app/view/Search.js
+3
-1
No files found.
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file @
84aab33f
...
@@ -127,6 +127,10 @@ define([
...
@@ -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
;
...
...
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file @
84aab33f
...
@@ -537,7 +537,7 @@ define([
...
@@ -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
'
);
...
...
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file @
84aab33f
...
@@ -95,6 +95,8 @@ define([
...
@@ -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">
'
+
...
...
apps/spreadsheeteditor/mobile/app/template/Toolbar.template
View file @
84aab33f
...
@@ -34,9 +34,11 @@
...
@@ -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>
...
...
apps/spreadsheeteditor/mobile/app/view/Search.js
View file @
84aab33f
...
@@ -91,9 +91,11 @@ define([
...
@@ -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>
'
,
...
...
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