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
705677a3
Commit
705677a3
authored
Dec 23, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Update hints for inserting and editing chart/sparklines buttons.
[Common] Fix updating hints for buttons.
parent
4178a2ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
3 deletions
+11
-3
apps/common/main/lib/component/Button.js
apps/common/main/lib/component/Button.js
+3
-1
apps/spreadsheeteditor/main/app/controller/RightMenu.js
apps/spreadsheeteditor/main/app/controller/RightMenu.js
+2
-0
apps/spreadsheeteditor/main/app/view/RightMenu.js
apps/spreadsheeteditor/main/app/view/RightMenu.js
+1
-0
apps/spreadsheeteditor/main/app/view/Toolbar.js
apps/spreadsheeteditor/main/app/view/Toolbar.js
+3
-2
apps/spreadsheeteditor/main/locale/en.json
apps/spreadsheeteditor/main/locale/en.json
+2
-0
No files found.
apps/common/main/lib/component/Button.js
View file @
705677a3
...
...
@@ -467,8 +467,10 @@ define([
var
cmpEl
=
this
.
cmpEl
,
modalParents
=
cmpEl
.
closest
(
'
.asc-window
'
);
if
(
cmpEl
.
data
(
'
bs.tooltip
'
))
cmpEl
.
removeData
(
'
bs.tooltip
'
);
cmpEl
.
attr
(
'
data-toggle
'
,
'
tooltip
'
);
cmpEl
.
tooltip
(
'
destroy
'
).
tooltip
(
{
cmpEl
.
tooltip
({
title
:
hint
,
placement
:
this
.
options
.
hintAnchor
||
'
cursor
'
});
...
...
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file @
705677a3
...
...
@@ -150,6 +150,7 @@ define([
if
(
settingsType
==
Common
.
Utils
.
documentSettingsType
.
Image
)
{
if
(
value
.
asc_getChartProperties
()
!==
null
)
{
settingsType
=
Common
.
Utils
.
documentSettingsType
.
Chart
;
this
.
_settings
[
settingsType
].
btn
.
updateHint
(
this
.
rightmenu
.
txtChartSettings
);
}
else
if
(
value
.
asc_getShapeProperties
()
!==
null
)
{
settingsType
=
Common
.
Utils
.
documentSettingsType
.
Shape
;
if
(
value
.
asc_getShapeProperties
().
asc_getTextArtProperties
())
{
...
...
@@ -177,6 +178,7 @@ define([
this
.
_settings
[
settingsType
].
props
=
sparkLineInfo
;
this
.
_settings
[
settingsType
].
locked
=
isSparkLocked
;
this
.
_settings
[
settingsType
].
hidden
=
0
;
this
.
_settings
[
settingsType
].
btn
.
updateHint
(
this
.
rightmenu
.
txtSparklineSettings
);
}
var
lastactive
=
-
1
,
currentactive
,
priorityactive
=
-
1
,
...
...
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file @
705677a3
...
...
@@ -255,6 +255,7 @@ define([
txtShapeSettings
:
'
Shape Settings
'
,
txtTextArtSettings
:
'
Text Art Settings
'
,
txtChartSettings
:
'
Chart Settings
'
,
txtSparklineSettings
:
'
Sparkline Settings
'
,
txtTableSettings
:
'
Table Settings
'
},
SSE
.
Views
.
RightMenu
||
{}));
});
\ No newline at end of file
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @
705677a3
...
...
@@ -1284,7 +1284,7 @@ define([
this
.
btnWrap
.
updateHint
(
this
.
tipWrap
);
this
.
btnTextOrient
.
updateHint
(
this
.
tipTextOrientation
);
this
.
btnInsertImage
.
updateHint
(
this
.
tipInsertImage
);
this
.
btnInsertChart
.
updateHint
(
this
.
tipInsertChart
);
this
.
btnInsertChart
.
updateHint
(
this
.
tipInsertChart
Spark
);
this
.
btnInsertText
.
updateHint
(
this
.
tipInsertText
);
this
.
btnInsertHyperlink
.
updateHint
(
this
.
tipInsertHyperlink
+
Common
.
Utils
.
String
.
platformKey
(
'
Ctrl+K
'
));
this
.
btnInsertShape
.
updateHint
(
this
.
tipInsertShape
);
...
...
@@ -2102,6 +2102,7 @@ define([
textWinLossSpark
:
'
Win/Loss
'
,
tipInsertEquation
:
'
Insert Equation
'
,
textCharts
:
'
Charts
'
,
textSparks
:
'
Sparklines
'
textSparks
:
'
Sparklines
'
,
tipInsertChartSpark
:
'
Insert Chart or Sparkline
'
},
SSE
.
Views
.
Toolbar
||
{}));
});
\ No newline at end of file
apps/spreadsheeteditor/main/locale/en.json
View file @
705677a3
...
...
@@ -1252,6 +1252,7 @@
"SSE.Views.RightMenu.txtParagraphSettings"
:
"Text Settings"
,
"SSE.Views.RightMenu.txtSettings"
:
"Common Settings"
,
"SSE.Views.RightMenu.txtShapeSettings"
:
"Shape Settings"
,
"SSE.Views.RightMenu.txtSparklineSettings"
:
"Sparkline Settings"
,
"SSE.Views.RightMenu.txtTableSettings"
:
"Table Settings"
,
"SSE.Views.RightMenu.txtTextArtSettings"
:
"Text Art Settings"
,
"SSE.Views.SetValueDialog.cancelButtonText"
:
"Cancel"
,
...
...
@@ -1536,6 +1537,7 @@
"SSE.Views.Toolbar.tipInsertOpt"
:
"Insert Cells"
,
"SSE.Views.Toolbar.tipInsertShape"
:
"Insert Autoshape"
,
"SSE.Views.Toolbar.tipInsertText"
:
"Insert Text"
,
"SSE.Views.Toolbar.tipInsertChartSpark"
:
"Insert Chart or Sparkline"
,
"SSE.Views.Toolbar.tipMerge"
:
"Merge"
,
"SSE.Views.Toolbar.tipNewDocument"
:
"New Document"
,
"SSE.Views.Toolbar.tipNumFormat"
:
"Number Format"
,
...
...
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