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
4f475457
Commit
4f475457
authored
Nov 25, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Added sparkline clearing to context menu.
parent
e82da5eb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
3 deletions
+27
-3
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+5
-2
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
+16
-1
apps/spreadsheeteditor/main/locale/en.json
apps/spreadsheeteditor/main/locale/en.json
+3
-0
apps/spreadsheeteditor/main/locale/ru.json
apps/spreadsheeteditor/main/locale/ru.json
+3
-0
No files found.
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file @
4f475457
...
...
@@ -153,6 +153,7 @@ define([
view
.
pmiDeleteEntire
.
on
(
'
click
'
,
_
.
bind
(
me
.
onDeleteEntire
,
me
));
view
.
pmiInsertCells
.
menu
.
on
(
'
item:click
'
,
_
.
bind
(
me
.
onInsertCells
,
me
));
view
.
pmiDeleteCells
.
menu
.
on
(
'
item:click
'
,
_
.
bind
(
me
.
onDeleteCells
,
me
));
view
.
pmiSparklines
.
menu
.
on
(
'
item:click
'
,
_
.
bind
(
me
.
onClear
,
me
));
view
.
pmiSortCells
.
menu
.
on
(
'
item:click
'
,
_
.
bind
(
me
.
onSortCells
,
me
));
view
.
pmiFilterCells
.
menu
.
on
(
'
item:click
'
,
_
.
bind
(
me
.
onFilterCells
,
me
));
view
.
pmiReapply
.
on
(
'
click
'
,
_
.
bind
(
me
.
onReapply
,
me
));
...
...
@@ -1265,6 +1266,7 @@ define([
var
iscelledit
=
this
.
api
.
isCellEdited
,
formatTableInfo
=
cellinfo
.
asc_getFormatTableInfo
(),
isinsparkline
=
(
cellinfo
.
asc_getSparklineInfo
()
!==
null
),
isintable
=
(
formatTableInfo
!==
null
),
ismultiselect
=
cellinfo
.
asc_getFlags
().
asc_getMultiselect
();
documentHolder
.
ssMenu
.
formatTableName
=
(
isintable
)
?
formatTableInfo
.
asc_getTableName
()
:
null
;
...
...
@@ -1279,10 +1281,11 @@ define([
documentHolder
.
pmiSelectTable
.
setVisible
(
iscellmenu
&&
!
iscelledit
&&
isintable
);
documentHolder
.
pmiInsertTable
.
setVisible
(
iscellmenu
&&
!
iscelledit
&&
isintable
);
documentHolder
.
pmiDeleteTable
.
setVisible
(
iscellmenu
&&
!
iscelledit
&&
isintable
);
documentHolder
.
pmiSparklines
.
setVisible
(
isinsparkline
);
documentHolder
.
pmiSortCells
.
setVisible
((
iscellmenu
||
isallmenu
||
cansort
)
&&
!
iscelledit
);
documentHolder
.
pmiFilterCells
.
setVisible
((
iscellmenu
||
cansort
)
&&
!
iscelledit
);
documentHolder
.
pmiReapply
.
setVisible
((
iscellmenu
||
isallmenu
||
cansort
)
&&
!
iscelledit
);
documentHolder
.
ssMenu
.
items
[
12
].
setVisible
((
iscellmenu
||
isallmenu
||
cansort
)
&&
!
iscelledit
);
documentHolder
.
ssMenu
.
items
[
12
].
setVisible
((
iscellmenu
||
isallmenu
||
cansort
||
isinsparkline
)
&&
!
iscelledit
);
documentHolder
.
pmiInsFunction
.
setVisible
(
iscellmenu
||
insfunc
);
documentHolder
.
pmiAddNamedRange
.
setVisible
(
iscellmenu
&&
!
iscelledit
);
...
...
@@ -1311,7 +1314,7 @@ define([
documentHolder
.
pmiEntriesList
.
setVisible
(
!
iscelledit
);
/** coauthoring begin **/
documentHolder
.
ssMenu
.
items
[
1
6
].
setVisible
(
iscellmenu
&&
!
iscelledit
&&
this
.
permissions
.
canCoAuthoring
&&
this
.
permissions
.
canComments
);
documentHolder
.
ssMenu
.
items
[
1
7
].
setVisible
(
iscellmenu
&&
!
iscelledit
&&
this
.
permissions
.
canCoAuthoring
&&
this
.
permissions
.
canComments
);
documentHolder
.
pmiAddComment
.
setVisible
(
iscellmenu
&&
!
iscelledit
&&
this
.
permissions
.
canCoAuthoring
&&
this
.
permissions
.
canComments
);
/** coauthoring end **/
documentHolder
.
pmiCellMenuSeparator
.
setVisible
(
iscellmenu
||
isrowmenu
||
iscolmenu
||
isallmenu
||
insfunc
);
...
...
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file @
4f475457
...
...
@@ -349,6 +349,17 @@ define([
caption
:
me
.
textEntriesList
});
me
.
pmiSparklines
=
new
Common
.
UI
.
MenuItem
({
caption
:
me
.
txtSparklines
,
menu
:
new
Common
.
UI
.
Menu
({
menuAlign
:
'
tl-tr
'
,
items
:
[
{
caption
:
me
.
txtClearSparklines
,
value
:
Asc
.
c_oAscCleanOptions
.
Sparklines
},
{
caption
:
me
.
txtClearSparklineGroups
,
value
:
Asc
.
c_oAscCleanOptions
.
SparklineGroups
}
]
})
});
me
.
ssMenu
=
new
Common
.
UI
.
Menu
({
id
:
'
id-context-menu-cell
'
,
items
:
[
...
...
@@ -365,6 +376,7 @@ define([
me
.
pmiDeleteTable
,
me
.
pmiClear
,
{
caption
:
'
--
'
},
me
.
pmiSparklines
,
me
.
pmiSortCells
,
me
.
pmiFilterCells
,
me
.
pmiReapply
,
...
...
@@ -691,7 +703,10 @@ define([
txtAutoRowHeight
:
'
Auto Fit Row Height
'
,
txtCustomColumnWidth
:
'
Custom Column Width
'
,
txtCustomRowHeight
:
'
Custom Row Height
'
,
textEntriesList
:
'
Select from drop-down list
'
textEntriesList
:
'
Select from drop-down list
'
,
txtSparklines
:
'
Sparklines
'
,
txtClearSparklines
:
'
Clear Selected Sparklines
'
,
txtClearSparklineGroups
:
'
Clear Selected Sparkline Groups
'
},
SSE
.
Views
.
DocumentHolder
||
{}));
});
\ No newline at end of file
apps/spreadsheeteditor/main/locale/en.json
View file @
4f475457
...
...
@@ -940,6 +940,9 @@
"SSE.Views.DocumentHolder.txtUngroup"
:
"Ungroup"
,
"SSE.Views.DocumentHolder.txtWidth"
:
"Width"
,
"SSE.Views.DocumentHolder.vertAlignText"
:
"Vertical Alignment"
,
"SSE.Views.DocumentHolder.txtSparklines"
:
"Sparklines"
,
"SSE.Views.DocumentHolder.txtClearSparklines"
:
"Clear Selected Sparklines"
,
"SSE.Views.DocumentHolder.txtClearSparklineGroups"
:
"Clear Selected Sparkline Groups"
,
"SSE.Views.FileMenu.btnBackCaption"
:
"Go to Documents"
,
"SSE.Views.FileMenu.btnCloseMenuCaption"
:
"Close Menu"
,
"SSE.Views.FileMenu.btnCreateNewCaption"
:
"Create New"
,
...
...
apps/spreadsheeteditor/main/locale/ru.json
View file @
4f475457
...
...
@@ -938,6 +938,9 @@
"SSE.Views.DocumentHolder.txtUngroup"
:
"Разгруппировать"
,
"SSE.Views.DocumentHolder.txtWidth"
:
"Ширина"
,
"SSE.Views.DocumentHolder.vertAlignText"
:
"Вертикальное выравнивание"
,
"SSE.Views.DocumentHolder.txtSparklines"
:
"Спарклайны"
,
"SSE.Views.DocumentHolder.txtClearSparklines"
:
"Очистить выбранные спарклайны"
,
"SSE.Views.DocumentHolder.txtClearSparklineGroups"
:
"Очистить выбранные группы спарклайнов"
,
"SSE.Views.FileMenu.btnBackCaption"
:
"Перейти к Документам"
,
"SSE.Views.FileMenu.btnCloseMenuCaption"
:
"Закрыть меню"
,
"SSE.Views.FileMenu.btnCreateNewCaption"
:
"Создать новую"
,
...
...
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