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
ec45ab8d
Commit
ec45ab8d
authored
Dec 20, 2016
by
Maxim Kadushkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE mobile] repaired Sort&Filter page
parent
edac20cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
1 deletion
+31
-1
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
+18
-0
apps/spreadsheeteditor/mobile/app/template/AddOther.template
apps/spreadsheeteditor/mobile/app/template/AddOther.template
+1
-1
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
+12
-0
No files found.
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
View file @
ec45ab8d
...
...
@@ -68,6 +68,8 @@ define([
'
page:show
'
:
this
.
onPageShow
,
'
link:insert
'
:
this
.
onInsertLink
,
'
image:insert
'
:
this
.
onInsertImage
,
'
insert:sort
'
:
this
.
onInsertSort
,
'
insert:filter
'
:
this
.
onInsertFilter
,
'
link:changetype
'
:
this
.
onChangeLinkType
,
'
link:changesheet
'
:
this
.
onChangeLinkSheet
}
...
...
@@ -128,6 +130,10 @@ define([
view
.
optionAllowInternal
(
allowinternal
);
allowinternal
&&
view
.
optionLinkType
(
this
.
optsLink
.
type
);
}
else
if
(
pageId
==
'
#addother-sort
'
)
{
var
filterInfo
=
this
.
api
.
asc_getCellInfo
().
asc_getAutoFilterInfo
();
view
.
optionAutofilter
(
filterInfo
?
filterInfo
.
asc_getIsAutoFilter
()
:
null
)
}
else
if
(
pageId
==
'
#addother-change-linktype
'
)
{
view
.
optionLinkType
(
this
.
optsLink
.
type
);
}
...
...
@@ -214,6 +220,18 @@ define([
}
},
onInsertSort
:
function
(
type
)
{
this
.
api
.
asc_sortColFilter
(
type
==
'
down
'
?
Asc
.
c_oAscSortOptions
.
Ascending
:
Asc
.
c_oAscSortOptions
.
Descending
,
''
);
},
onInsertFilter
:
function
(
checked
)
{
var
formatTableInfo
=
this
.
api
.
asc_getCellInfo
().
asc_getFormatTableInfo
();
var
tablename
=
(
formatTableInfo
)
?
formatTableInfo
.
asc_getTableName
()
:
undefined
;
if
(
checked
)
this
.
api
.
asc_addAutoFilter
();
else
this
.
api
.
asc_changeAutoFilter
(
tablename
,
Asc
.
c_oAscChangeFilterOptions
.
filter
,
checked
);
},
textInvalidRange
:
'
ERROR! Invalid cells range
'
,
textEmptyImgUrl
:
'
You need to specify image URL.
'
,
txtNotUrl
:
'
This field should be a URL in the format
\
"http://www.example.com
\
"
'
...
...
apps/spreadsheeteditor/mobile/app/template/AddOther.template
View file @
ec45ab8d
...
...
@@ -240,7 +240,7 @@
</div>
<div class="list-block">
<ul>
<li id="
paragraph-page-break
">
<li id="
other-chb-insfilter
">
<div class="item-content">
<div class="item-inner">
<div class="item-title"><%= scope.textFilter %></div>
...
...
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
View file @
ec45ab8d
...
...
@@ -152,6 +152,14 @@ define([
showSortPage
:
function
(
e
)
{
this
.
showPage
(
'
#addother-sort
'
);
var
me
=
this
;
$
(
'
.settings .sortdown
'
).
single
(
'
click
'
,
function
(
e
)
{
me
.
fireEvent
(
'
insert:sort
'
,[
'
down
'
]);});
$
(
'
.settings .sortup
'
).
single
(
'
click
'
,
function
(
e
)
{
me
.
fireEvent
(
'
insert:sort
'
,[
'
up
'
]);});
$
(
'
.settings #other-chb-insfilter input:checkbox
'
).
single
(
'
change
'
,
function
(
e
)
{
var
$checkbox
=
$
(
e
.
currentTarget
);
me
.
fireEvent
(
'
insert:filter
'
,
[
$checkbox
.
is
(
'
:checked
'
)]);
});
},
clickInsertLink
:
function
(
e
)
{
...
...
@@ -187,6 +195,10 @@ define([
_
.
delay
(
function
()
{
$input
.
focus
();
},
1000
);
},
optionAutofilter
:
function
(
checked
)
{
$
(
'
.settings #other-chb-insfilter input:checkbox
'
).
prop
(
'
checked
'
,
checked
);
},
optionLinkType
:
function
(
type
,
opts
)
{
this
.
link
.
type
=
type
;
...
...
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