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
f05ee648
Commit
f05ee648
authored
Jan 23, 2017
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Fixed thumbnail size of paragraph styles.
parent
66a9960e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
...ocumenteditor/mobile/app/controller/edit/EditParagraph.js
+6
-6
apps/documenteditor/mobile/app/view/edit/EditParagraph.js
apps/documenteditor/mobile/app/view/edit/EditParagraph.js
+2
-2
No files found.
apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
View file @
f05ee648
...
...
@@ -55,7 +55,7 @@ define([
_paragraphInfo
=
{},
_paragraphObject
=
undefined
,
_styles
=
[],
_styleTumbSize
,
_styleT
h
umbSize
,
metricText
=
Common
.
Utils
.
Metric
.
getCurrentMetricName
();
return
{
...
...
@@ -180,8 +180,8 @@ define([
return
_styles
||
[];
},
getTumbSize
:
function
()
{
return
_styleTumbSize
||
{
width
:
0
,
height
:
0
};
getT
h
umbSize
:
function
()
{
return
_styleT
h
umbSize
||
{
width
:
0
,
height
:
0
};
},
// Handlers
...
...
@@ -308,9 +308,9 @@ define([
}
_styles
=
[];
_styleTumbSize
=
{
width
:
styles
.
STYLE_THUMBNAIL_WIDTH
/
uiApp
.
device
.
pixelRatio
,
height
:
styles
.
STYLE_THUMBNAIL_HEIGHT
/
uiApp
.
device
.
pixelRatio
_styleT
h
umbSize
=
{
width
:
styles
.
STYLE_THUMBNAIL_WIDTH
,
height
:
styles
.
STYLE_THUMBNAIL_HEIGHT
};
_
.
each
(
styles
.
get_MergedStyles
(),
function
(
style
){
...
...
apps/documenteditor/mobile/app/view/edit/EditParagraph.js
View file @
f05ee648
...
...
@@ -121,7 +121,7 @@ define([
renderStyles
:
function
()
{
var
me
=
this
,
th
imbSize
=
DE
.
getController
(
'
EditParagraph
'
).
getT
umbSize
(),
th
umbSize
=
DE
.
getController
(
'
EditParagraph
'
).
getTh
umbSize
(),
$styleList
=
$
(
'
#paragraph-list ul
'
),
template
=
_
.
template
(
'
<li>
'
+
...
...
@@ -129,7 +129,7 @@ define([
'
<input type="radio" name="paragraph-style" value="<%= name %>">
'
+
(
Framework7
.
prototype
.
device
.
android
?
'
<div class="item-media"><i class="icon icon-form-radio"></i></div>
'
:
''
)
+
'
<div class="item-inner">
'
+
'
<div data-name="<%= name %>" class="item-title style" style="background-image: url(<%= image %>); width:{0}px; height:{1}px; background-size:{0}px {1}px; background-repeat: no-repeat;"></div>
'
.
format
(
th
imbSize
.
width
,
thi
mbSize
.
height
)
+
'
<div data-name="<%= name %>" class="item-title style" style="background-image: url(<%= image %>); width:{0}px; height:{1}px; background-size:{0}px {1}px; background-repeat: no-repeat;"></div>
'
.
format
(
th
umbSize
.
width
,
thu
mbSize
.
height
)
+
'
</div>
'
+
'
</label>
'
+
'
</li>
'
...
...
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