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
ae673b56
Commit
ae673b56
authored
Nov 25, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Fix bug with shape border size.
parent
97ec7f09
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
apps/documenteditor/mobile/app/controller/edit/EditChart.js
apps/documenteditor/mobile/app/controller/edit/EditChart.js
+3
-4
apps/documenteditor/mobile/app/controller/edit/EditShape.js
apps/documenteditor/mobile/app/controller/edit/EditShape.js
+3
-3
No files found.
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file @
ae673b56
...
...
@@ -223,10 +223,9 @@ define([
$
(
'
.chart-types li[data-type=
'
+
type
+
'
]
'
).
addClass
(
'
active
'
);
// Init style border size
var
borderSize
=
borderSizeTransform
.
sizeByValue
(
shapeProperties
.
get_stroke
().
get_width
());
$
(
'
#edit-chart-bordersize input
'
).
val
([
borderSizeTransform
.
sizeByIndex
(
shapeProperties
.
get_stroke
().
get_width
())]);
$
(
'
#edit-chart-bordersize .item-after
'
).
text
(
borderSize
+
'
'
+
_metricText
);
var
borderSize
=
shapeProperties
.
get_stroke
().
get_width
()
*
72.0
/
25.4
;
$
(
'
#edit-chart-bordersize input
'
).
val
([
borderSizeTransform
.
sizeByIndex
(
borderSize
)]);
$
(
'
#edit-chart-bordersize .item-after
'
).
text
(
borderSizeTransform
.
sizeByValue
(
borderSize
)
+
'
'
+
_metricText
);
paletteFillColor
&&
paletteFillColor
.
on
(
'
select
'
,
_
.
bind
(
me
.
onFillColor
,
me
));
paletteBorderColor
&&
paletteBorderColor
.
on
(
'
select
'
,
_
.
bind
(
me
.
onBorderColor
,
me
));
...
...
apps/documenteditor/mobile/app/controller/edit/EditShape.js
View file @
ae673b56
...
...
@@ -210,9 +210,9 @@ define([
paletteBorderColor
=
me
.
getView
(
'
EditShape
'
).
paletteBorderColor
;
// Init style border size
var
borderSize
=
borderSizeTransform
.
sizeByValue
(
shapeProperties
.
get_stroke
().
get_width
())
;
$
(
'
#edit-shape-bordersize input
'
).
val
([
borderSizeTransform
.
sizeByIndex
(
shapeProperties
.
get_stroke
().
get_width
()
)]);
$
(
'
#edit-shape-bordersize .item-after
'
).
text
(
borderSize
+
'
'
+
_metricText
);
var
borderSize
=
shapeProperties
.
get_stroke
().
get_width
()
*
72.0
/
25.4
;
$
(
'
#edit-shape-bordersize input
'
).
val
([
borderSizeTransform
.
sizeByIndex
(
borderSize
)]);
$
(
'
#edit-shape-bordersize .item-after
'
).
text
(
borderSize
Transform
.
sizeByValue
(
borderSize
)
+
'
'
+
_metricText
);
// Init style opacity
$
(
'
#edit-shape-effect input
'
).
val
([
shapeProperties
.
get_fill
().
transparent
?
shapeProperties
.
get_fill
().
transparent
/
2.55
:
100
]);
...
...
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