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
b1659413
Commit
b1659413
authored
Mar 10, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Changes for Bug 34141.
parent
6e553f5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
.../spreadsheeteditor/mobile/app/controller/edit/EditText.js
+2
-3
apps/spreadsheeteditor/mobile/app/template/EditText.template
apps/spreadsheeteditor/mobile/app/template/EditText.template
+1
-1
No files found.
apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
View file @
b1659413
...
...
@@ -151,8 +151,7 @@ define([
var
color
=
_fontInfo
.
asc_getColor
(),
clr
=
me
.
_sdkToThemeColor
(
color
);
$
(
'
#text-color .color-preview
'
).
css
(
'
background-color
'
,
'
#
'
+
(
_
.
isObject
(
clr
)
?
clr
.
color
:
clr
));
$
(
'
#font-color .color-preview
'
).
css
(
'
background-color
'
,
'
#
'
+
(
_
.
isObject
(
clr
)
?
clr
.
color
:
clr
));
// Align
$
(
'
#edit-text-align-block
'
).
css
(
'
display
'
,
(
_textIn
==
TextType
.
inShape
)
?
'
block
'
:
'
none
'
);
...
...
@@ -279,7 +278,7 @@ define([
onTextColor
:
function
(
palette
,
color
)
{
this
.
api
.
asc_setCellTextColor
(
Common
.
Utils
.
ThemeColor
.
getRgbColor
(
color
));
$
(
'
#
tex
t-color .color-preview
'
).
css
(
'
background-color
'
,
'
#
'
+
(
_
.
isObject
(
color
)
?
color
.
color
:
color
));
$
(
'
#
fon
t-color .color-preview
'
).
css
(
'
background-color
'
,
'
#
'
+
(
_
.
isObject
(
color
)
?
color
.
color
:
color
));
},
onHAlignChange
:
function
(
e
)
{
...
...
apps/spreadsheeteditor/mobile/app/template/EditText.template
View file @
b1659413
...
...
@@ -24,7 +24,7 @@
</div>
</li>
<li>
<a id="
tex
t-color" class="item-link" data-page="#edit-text-color">
<a id="
fon
t-color" class="item-link" data-page="#edit-text-color">
<div class="item-content">
<% if (!android) { %><div class="item-media" style="padding-top: 0;"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %>
<div class="item-inner">
...
...
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