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
215a4c98
Commit
215a4c98
authored
Feb 16, 2017
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Fix Bug 34066
parent
c7dee393
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
apps/documenteditor/mobile/app/controller/edit/EditShape.js
apps/documenteditor/mobile/app/controller/edit/EditShape.js
+1
-1
apps/documenteditor/mobile/locale/ru.json
apps/documenteditor/mobile/locale/ru.json
+1
-1
apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
...spreadsheeteditor/mobile/app/controller/edit/EditShape.js
+1
-1
No files found.
apps/documenteditor/mobile/app/controller/edit/EditShape.js
View file @
215a4c98
...
...
@@ -224,7 +224,7 @@ define([
$
(
'
#edit-shape-bordersize .item-after
'
).
text
(((
borderType
==
Asc
.
c_oAscStrokeType
.
STROKE_NONE
)
?
0
:
borderSizeTransform
.
sizeByValue
(
borderSize
))
+
'
'
+
_metricText
);
// Init style opacity
$
(
'
#edit-shape-effect input
'
).
val
([
shapeProperties
.
get_fill
().
transparent
?
shapeProperties
.
get_fill
().
transparent
/
2.55
:
100
]);
$
(
'
#edit-shape-effect input
'
).
val
([
shapeProperties
.
get_fill
().
asc_getTransparent
()
?
shapeProperties
.
get_fill
().
asc_getTransparent
()
/
2.55
:
100
]);
$
(
'
#edit-shape-effect .item-after
'
).
text
(
$
(
'
#edit-shape-effect input
'
).
val
()
+
'
'
+
"
%
"
);
paletteFillColor
&&
paletteFillColor
.
on
(
'
select
'
,
_
.
bind
(
me
.
onFillColor
,
me
));
...
...
apps/documenteditor/mobile/locale/ru.json
View file @
215a4c98
...
...
@@ -3,7 +3,7 @@
"Common.UI.ThemeColorPalette.textThemeColors"
:
"Цвета темы"
,
"Common.Utils.Metric.txtCm"
:
"см"
,
"Common.Utils.Metric.txtPt"
:
"пт"
,
"DE.Controllers.AddContainer.textImage"
:
"
Изображение
"
,
"DE.Controllers.AddContainer.textImage"
:
"
Картинка
"
,
"DE.Controllers.AddContainer.textOther"
:
"Другое"
,
"DE.Controllers.AddContainer.textShape"
:
"Фигура"
,
"DE.Controllers.AddContainer.textTable"
:
"Таблица"
,
...
...
apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
View file @
215a4c98
...
...
@@ -195,7 +195,7 @@ define([
// Effect
// Init style opacity
$
(
'
#edit-shape-effect input
'
).
val
([
shapeProperties
.
get_fill
().
transparent
?
shapeProperties
.
get_fill
().
transparent
/
2.55
:
100
]);
$
(
'
#edit-shape-effect input
'
).
val
([
shapeProperties
.
get_fill
().
asc_getTransparent
()
?
shapeProperties
.
get_fill
().
asc_getTransparent
()
/
2.55
:
100
]);
$
(
'
#edit-shape-effect .item-after
'
).
text
(
$
(
'
#edit-shape-effect input
'
).
val
()
+
'
'
+
"
%
"
);
$
(
'
#edit-shape-effect input
'
).
single
(
'
change touchend
'
,
_
.
buffered
(
me
.
onOpacity
,
100
,
me
));
$
(
'
#edit-shape-effect input
'
).
single
(
'
input
'
,
_
.
bind
(
me
.
onOpacityChanging
,
me
));
...
...
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