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
fa40ed51
Commit
fa40ed51
authored
May 17, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Добавлена сортировка по цветам в контекстное меню.
parent
3875b0aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+1
-1
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
+9
-2
apps/spreadsheeteditor/main/locale/en.json
apps/spreadsheeteditor/main/locale/en.json
+7
-0
No files found.
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file @
fa40ed51
...
...
@@ -338,7 +338,7 @@ define([
onSortCells
:
function
(
menu
,
item
)
{
if
(
this
.
api
)
{
this
.
api
.
asc_sortColFilter
(
item
.
value
,
''
);
this
.
api
.
asc_sortColFilter
(
item
.
value
,
''
,
null
,
(
item
.
value
==
Asc
.
c_oAscSortOptions
.
ByColorFill
)
?
this
.
documentHolder
.
ssMenu
.
cellColor
:
this
.
documentHolder
.
ssMenu
.
fontColor
);
Common
.
NotificationCenter
.
trigger
(
'
edit:complete
'
,
this
.
documentHolder
);
Common
.
component
.
Analytics
.
trackEvent
(
'
DocumentHolder
'
,
'
Sort Cells
'
);
...
...
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file @
fa40ed51
...
...
@@ -234,6 +234,12 @@ define([
},{
caption
:
me
.
txtDescending
,
value
:
Asc
.
c_oAscSortOptions
.
Descending
},{
caption
:
me
.
txtSortCellColor
,
value
:
Asc
.
c_oAscSortOptions
.
ByColorFill
},{
caption
:
me
.
txtSortFontColor
,
value
:
Asc
.
c_oAscSortOptions
.
ByColorFont
}
]
})
...
...
@@ -660,7 +666,8 @@ define([
txtFilterValue
:
'
Filter by Selected cell
\'
s value
'
,
txtFilterCellColor
:
'
Filter by cell
\'
s color
'
,
txtFilterFontColor
:
'
Filter by font color
'
,
txtReapply
:
'
Reapply
'
txtReapply
:
'
Reapply
'
,
txtSortCellColor
:
'
Selected Cell Color on top
'
,
txtSortFontColor
:
'
Selected Font Color on top
'
},
SSE
.
Views
.
DocumentHolder
||
{}));
});
\ No newline at end of file
apps/spreadsheeteditor/main/locale/en.json
View file @
fa40ed51
...
...
@@ -485,6 +485,13 @@
"SSE.Views.DocumentHolder.deleteRowText"
:
"Delete Row"
,
"SSE.Views.DocumentHolder.deleteColumnText"
:
"Delete Column"
,
"SSE.Views.DocumentHolder.deleteTableText"
:
"Delete Table"
,
"SSE.Views.DocumentHolder.txtFilter"
:
"Filter"
,
"SSE.Views.DocumentHolder.txtFilterValue"
:
"Filter by Selected cell's value"
,
"SSE.Views.DocumentHolder.txtFilterCellColor"
:
"Filter by cell's color"
,
"SSE.Views.DocumentHolder.txtFilterFontColor"
:
"Filter by font color"
,
"SSE.Views.DocumentHolder.txtReapply"
:
"Reapply"
,
"SSE.Views.DocumentHolder.txtSortCellColor"
:
"Selected Cell Color on top"
,
"SSE.Views.DocumentHolder.txtSortFontColor"
:
"Selected Font Color on top"
,
"SSE.Views.FileMenu.btnBackCaption"
:
"Go to Documents"
,
"SSE.Views.FileMenu.btnCreateNewCaption"
:
"Create New"
,
"SSE.Views.FileMenu.btnDownloadCaption"
:
"Download as..."
,
...
...
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