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
ed6f2256
Commit
ed6f2256
authored
Jun 27, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Tooltips for cell styles.
parent
7c2bcf73
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+8
-7
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+2
-0
apps/spreadsheeteditor/main/app/view/Toolbar.js
apps/spreadsheeteditor/main/app/view/Toolbar.js
+0
-1
No files found.
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
ed6f2256
...
...
@@ -105,6 +105,7 @@ define([
var
me
=
this
;
this
.
_state
=
{
isDisconnected
:
false
,
usersCount
:
1
,
fastCoauth
:
true
,
lostEditingRights
:
false
,
licenseWarning
:
false
};
this
.
translationTable
=
[];
if
(
!
Common
.
Utils
.
isBrowserSupported
()){
Common
.
Utils
.
showBrowserRestriction
();
...
...
@@ -129,16 +130,16 @@ define([
'
Your text here
'
:
this
.
txtArt
};
styleNames
.
forEach
(
function
(
item
){
translate
[
item
]
=
me
[
'
txtStyle_
'
+
item
.
replace
(
/ /g
,
'
_
'
)]
||
item
;
translate
[
item
]
=
me
.
translationTable
[
item
]
=
me
[
'
txtStyle_
'
+
item
.
replace
(
/ /g
,
'
_
'
)]
||
item
;
});
translate
[
'
Currency [0]
'
]
=
me
.
txtStyle_Currency
+
'
[0]
'
;
translate
[
'
Comma [0]
'
]
=
me
.
txtStyle_Comma
+
'
[0]
'
;
translate
[
'
Currency [0]
'
]
=
me
.
t
ranslationTable
[
'
Currency [0]
'
]
=
me
.
t
xtStyle_Currency
+
'
[0]
'
;
translate
[
'
Comma [0]
'
]
=
me
.
t
ranslationTable
[
'
Comma [0]
'
]
=
me
.
t
xtStyle_Comma
+
'
[0]
'
;
for
(
var
i
=
1
;
i
<
7
;
i
++
)
{
translate
[
'
Accent
'
+
i
]
=
me
.
txtAccent
+
i
;
translate
[
'
20% - Accent
'
+
i
]
=
'
20% -
'
+
me
.
txtAccent
+
i
;
translate
[
'
40% - Accent
'
+
i
]
=
'
40% -
'
+
me
.
txtAccent
+
i
;
translate
[
'
60% - Accent
'
+
i
]
=
'
60% -
'
+
me
.
txtAccent
+
i
;
translate
[
'
Accent
'
+
i
]
=
me
.
t
ranslationTable
[
'
Accent
'
+
i
]
=
me
.
t
xtAccent
+
i
;
translate
[
'
20% - Accent
'
+
i
]
=
me
.
translationTable
[
'
20% - Accent
'
+
i
]
=
'
20% -
'
+
me
.
txtAccent
+
i
;
translate
[
'
40% - Accent
'
+
i
]
=
me
.
translationTable
[
'
40% - Accent
'
+
i
]
=
'
40% -
'
+
me
.
txtAccent
+
i
;
translate
[
'
60% - Accent
'
+
i
]
=
me
.
translationTable
[
'
60% - Accent
'
+
i
]
=
'
60% -
'
+
me
.
txtAccent
+
i
;
}
this
.
api
=
new
Asc
.
spreadsheet_api
({
...
...
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
ed6f2256
...
...
@@ -1536,11 +1536,13 @@ define([
listStyles
.
menuPicker
.
store
.
reset
([]);
// remove all
var
mainController
=
this
.
getApplication
().
getController
(
'
Main
'
);
var
merged_array
=
styles
.
asc_getDefaultStyles
().
concat
(
styles
.
asc_getDocStyles
());
_
.
each
(
merged_array
,
function
(
style
){
listStyles
.
menuPicker
.
store
.
add
({
imageUrl
:
style
.
asc_getImage
(),
name
:
style
.
asc_getName
(),
tip
:
mainController
.
translationTable
[
style
.
get_Name
()]
||
style
.
get_Name
(),
uid
:
Common
.
UI
.
getId
()
});
});
...
...
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @
ed6f2256
...
...
@@ -617,7 +617,6 @@ define([
enableKeyEvents
:
true
,
itemWidth
:
112
,
itemHeight
:
38
,
hint
:
this
.
tipCellStyle
,
menuMaxHeight
:
226
,
lock
:
[
_set
.
editCell
,
_set
.
selChart
,
_set
.
selChartText
,
_set
.
selShape
,
_set
.
selShapeText
,
_set
.
selImage
,
_set
.
lostConnect
,
_set
.
coAuth
],
beforeOpenHandler
:
function
(
e
)
{
...
...
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