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
a01ec32e
Commit
a01ec32e
authored
Apr 05, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FONT_THUMBNAIL_HEIGHT -> Asc.FONT_THUMBNAIL_HEIGHT
shd_Clear -> Asc.c_oAscShdClear shd_Nil -> Asc.c_oAscShdNil
parent
22967992
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
apps/common/main/lib/component/ComboBoxFonts.js
apps/common/main/lib/component/ComboBoxFonts.js
+5
-5
apps/documenteditor/main/app/controller/Toolbar.js
apps/documenteditor/main/app/controller/Toolbar.js
+1
-1
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
+3
-3
apps/documenteditor/main/app/view/ParagraphSettings.js
apps/documenteditor/main/app/view/ParagraphSettings.js
+1
-1
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
...documenteditor/main/app/view/ParagraphSettingsAdvanced.js
+3
-3
No files found.
apps/common/main/lib/component/ComboBoxFonts.js
View file @
a01ec32e
...
@@ -50,7 +50,7 @@ define([
...
@@ -50,7 +50,7 @@ define([
Common
.
UI
.
ComboBoxFonts
=
Common
.
UI
.
ComboBox
.
extend
((
function
()
{
Common
.
UI
.
ComboBoxFonts
=
Common
.
UI
.
ComboBox
.
extend
((
function
()
{
var
iconWidth
=
302
,
var
iconWidth
=
302
,
iconHeight
=
FONT_THUMBNAIL_HEIGHT
||
26
,
iconHeight
=
Asc
.
FONT_THUMBNAIL_HEIGHT
||
26
,
isRetina
=
window
.
devicePixelRatio
>
1
,
isRetina
=
window
.
devicePixelRatio
>
1
,
thumbCanvas
=
document
.
createElement
(
'
canvas
'
),
thumbCanvas
=
document
.
createElement
(
'
canvas
'
),
thumbContext
=
thumbCanvas
.
getContext
(
'
2d
'
),
thumbContext
=
thumbCanvas
.
getContext
(
'
2d
'
),
...
@@ -259,10 +259,10 @@ define([
...
@@ -259,10 +259,10 @@ define([
if
(
isRetina
)
{
if
(
isRetina
)
{
thumbContext
.
clearRect
(
0
,
0
,
iconWidth
*
2
,
iconHeight
*
2
);
thumbContext
.
clearRect
(
0
,
0
,
iconWidth
*
2
,
iconHeight
*
2
);
thumbContext
.
drawImage
(
this
.
spriteThumbs
,
0
,
-
FONT_THUMBNAIL_HEIGHT
*
2
*
opts
.
imgidx
);
thumbContext
.
drawImage
(
this
.
spriteThumbs
,
0
,
-
Asc
.
FONT_THUMBNAIL_HEIGHT
*
2
*
opts
.
imgidx
);
}
else
{
}
else
{
thumbContext
.
clearRect
(
0
,
0
,
iconWidth
,
iconHeight
);
thumbContext
.
clearRect
(
0
,
0
,
iconWidth
,
iconHeight
);
thumbContext
.
drawImage
(
this
.
spriteThumbs
,
0
,
-
FONT_THUMBNAIL_HEIGHT
*
opts
.
imgidx
);
thumbContext
.
drawImage
(
this
.
spriteThumbs
,
0
,
-
Asc
.
FONT_THUMBNAIL_HEIGHT
*
opts
.
imgidx
);
}
}
return
thumbCanvas
.
toDataURL
();
return
thumbCanvas
.
toDataURL
();
...
@@ -474,10 +474,10 @@ define([
...
@@ -474,10 +474,10 @@ define([
if
(
isRetina
)
{
if
(
isRetina
)
{
context
.
clearRect
(
0
,
0
,
iconWidth
*
2
,
iconHeight
*
2
);
context
.
clearRect
(
0
,
0
,
iconWidth
*
2
,
iconHeight
*
2
);
context
.
drawImage
(
me
.
spriteThumbs
,
0
,
-
FONT_THUMBNAIL_HEIGHT
*
2
*
index
);
context
.
drawImage
(
me
.
spriteThumbs
,
0
,
-
Asc
.
FONT_THUMBNAIL_HEIGHT
*
2
*
index
);
}
else
{
}
else
{
context
.
clearRect
(
0
,
0
,
iconWidth
,
iconHeight
);
context
.
clearRect
(
0
,
0
,
iconWidth
,
iconHeight
);
context
.
drawImage
(
me
.
spriteThumbs
,
0
,
-
FONT_THUMBNAIL_HEIGHT
*
index
);
context
.
drawImage
(
me
.
spriteThumbs
,
0
,
-
Asc
.
FONT_THUMBNAIL_HEIGHT
*
index
);
}
}
me
.
tiles
[
j
]
=
fontImage
;
me
.
tiles
[
j
]
=
fontImage
;
...
...
apps/documenteditor/main/app/controller/Toolbar.js
View file @
a01ec32e
...
@@ -2068,7 +2068,7 @@ define([
...
@@ -2068,7 +2068,7 @@ define([
onParagraphColor
:
function
(
shd
)
{
onParagraphColor
:
function
(
shd
)
{
var
picker
=
this
.
toolbar
.
mnuParagraphColorPicker
,
clr
;
var
picker
=
this
.
toolbar
.
mnuParagraphColorPicker
,
clr
;
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
shd_
Clear
)
{
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
Asc
.
c_oAscShd
Clear
)
{
var
color
=
shd
.
get_Color
();
var
color
=
shd
.
get_Color
();
if
(
color
)
{
if
(
color
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
...
...
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file @
a01ec32e
...
@@ -247,9 +247,9 @@ define([
...
@@ -247,9 +247,9 @@ define([
me
.
_changedProps
.
put_Shade
(
new
CParagraphShd
());
me
.
_changedProps
.
put_Shade
(
new
CParagraphShd
());
}
}
if
(
color
==
'
transparent
'
)
{
if
(
color
==
'
transparent
'
)
{
me
.
_changedProps
.
get_Shade
().
put_Value
(
shd_
Nil
);
me
.
_changedProps
.
get_Shade
().
put_Value
(
Asc
.
c_oAscShd
Nil
);
}
else
{
}
else
{
me
.
_changedProps
.
get_Shade
().
put_Value
(
shd_
Clear
);
me
.
_changedProps
.
get_Shade
().
put_Value
(
Asc
.
c_oAscShd
Clear
);
me
.
_changedProps
.
get_Shade
().
put_Color
(
Common
.
Utils
.
ThemeColor
.
getRgbColor
(
color
));
me
.
_changedProps
.
get_Shade
().
put_Color
(
Common
.
Utils
.
ThemeColor
.
getRgbColor
(
color
));
}
}
}
}
...
@@ -972,7 +972,7 @@ define([
...
@@ -972,7 +972,7 @@ define([
}
}
var
shd
=
frame_props
.
get_Shade
();
var
shd
=
frame_props
.
get_Shade
();
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
shd_
Clear
)
{
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
Asc
.
c_oAscShd
Clear
)
{
var
color
=
shd
.
get_Color
();
var
color
=
shd
.
get_Color
();
if
(
color
)
{
if
(
color
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
...
...
apps/documenteditor/main/app/view/ParagraphSettings.js
View file @
a01ec32e
...
@@ -364,7 +364,7 @@ define([
...
@@ -364,7 +364,7 @@ define([
}
}
var
shd
=
prop
.
get_Shade
();
var
shd
=
prop
.
get_Shade
();
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
shd_
Clear
)
{
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
Asc
.
c_oAscShd
Clear
)
{
var
color
=
shd
.
get_Color
();
var
color
=
shd
.
get_Color
();
if
(
color
)
{
if
(
color
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
...
...
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file @
a01ec32e
...
@@ -641,7 +641,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
...
@@ -641,7 +641,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
// Borders
// Borders
var
shd
=
props
.
get_Shade
();
var
shd
=
props
.
get_Shade
();
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
shd_
Clear
)
{
if
(
shd
!==
null
&&
shd
!==
undefined
&&
shd
.
get_Value
()
===
Asc
.
c_oAscShd
Clear
)
{
var
color
=
shd
.
get_Color
();
var
color
=
shd
.
get_Color
();
if
(
color
)
{
if
(
color
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
if
(
color
.
get_type
()
==
Asc
.
c_oAscColor
.
COLOR_TYPE_SCHEME
)
{
...
@@ -913,9 +913,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
...
@@ -913,9 +913,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this
.
_changedProps
.
put_Shade
(
new
CParagraphShd
());
this
.
_changedProps
.
put_Shade
(
new
CParagraphShd
());
}
}
if
(
this
.
paragraphShade
==
'
transparent
'
)
{
if
(
this
.
paragraphShade
==
'
transparent
'
)
{
this
.
_changedProps
.
get_Shade
().
put_Value
(
shd_
Nil
);
this
.
_changedProps
.
get_Shade
().
put_Value
(
Asc
.
c_oAscShd
Nil
);
}
else
{
}
else
{
this
.
_changedProps
.
get_Shade
().
put_Value
(
shd_
Clear
);
this
.
_changedProps
.
get_Shade
().
put_Value
(
Asc
.
c_oAscShd
Clear
);
this
.
_changedProps
.
get_Shade
().
put_Color
(
Common
.
Utils
.
ThemeColor
.
getRgbColor
(
this
.
paragraphShade
));
this
.
_changedProps
.
get_Shade
().
put_Color
(
Common
.
Utils
.
ThemeColor
.
getRgbColor
(
this
.
paragraphShade
));
}
}
}
}
...
...
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