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
14a24dd2
Commit
14a24dd2
authored
Apr 08, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32136
parent
762f7172
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
+7
-7
No files found.
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file @
14a24dd2
...
@@ -525,7 +525,7 @@ define([
...
@@ -525,7 +525,7 @@ define([
me
.
spnHeight
.
setValue
((
record
.
value
==
0
)
?
''
:
1
);
me
.
spnHeight
.
setValue
((
record
.
value
==
0
)
?
''
:
1
);
me
.
spnHeight
.
resumeEvents
();
me
.
spnHeight
.
resumeEvents
();
me
.
_changedProps
.
put_HRule
((
record
.
value
==
0
)
?
linerule_Auto
:
((
record
.
value
==
1
)
?
linerule_Exact
:
linerule_AtLeast
));
me
.
_changedProps
.
put_HRule
((
record
.
value
==
0
)
?
Asc
.
linerule_Auto
:
((
record
.
value
==
1
)
?
Asc
.
linerule_Exact
:
Asc
.
linerule_AtLeast
));
if
(
record
.
value
>
0
)
if
(
record
.
value
>
0
)
this
.
_changedProps
.
put_H
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
spnHeight
.
getNumberValue
()));
this
.
_changedProps
.
put_H
(
Common
.
Utils
.
Metric
.
fnRecalcToMM
(
this
.
spnHeight
.
getNumberValue
()));
}
}
...
@@ -542,16 +542,16 @@ define([
...
@@ -542,16 +542,16 @@ define([
})
})
.
on
(
'
change
'
,
_
.
bind
(
function
(
field
,
newValue
,
oldValue
)
{
.
on
(
'
change
'
,
_
.
bind
(
function
(
field
,
newValue
,
oldValue
)
{
if
(
me
.
_changedProps
)
{
if
(
me
.
_changedProps
)
{
var
type
=
linerule_Auto
;
var
type
=
Asc
.
linerule_Auto
;
if
(
me
.
cmbHeight
.
getValue
()
==
me
.
_arrHeight
[
1
].
value
)
if
(
me
.
cmbHeight
.
getValue
()
==
me
.
_arrHeight
[
1
].
value
)
type
=
linerule_Exact
;
type
=
Asc
.
linerule_Exact
;
else
if
(
me
.
cmbHeight
.
getValue
()
==
me
.
_arrHeight
[
2
].
value
)
else
if
(
me
.
cmbHeight
.
getValue
()
==
me
.
_arrHeight
[
2
].
value
)
type
=
linerule_AtLeast
;
type
=
Asc
.
linerule_AtLeast
;
if
(
type
==
linerule_Auto
)
{
if
(
type
==
Asc
.
linerule_Auto
)
{
me
.
cmbHeight
.
suspendEvents
();
me
.
cmbHeight
.
suspendEvents
();
me
.
cmbHeight
.
setValue
(
me
.
_arrHeight
[
2
].
value
);
me
.
cmbHeight
.
setValue
(
me
.
_arrHeight
[
2
].
value
);
type
=
linerule_AtLeast
;
type
=
Asc
.
linerule_AtLeast
;
me
.
cmbHeight
.
resumeEvents
();
me
.
cmbHeight
.
resumeEvents
();
}
}
...
@@ -870,7 +870,7 @@ define([
...
@@ -870,7 +870,7 @@ define([
value
=
frame_props
.
get_HRule
();
value
=
frame_props
.
get_HRule
();
if
(
value
!==
undefined
)
{
if
(
value
!==
undefined
)
{
this
.
cmbHeight
.
setValue
((
value
===
linerule_Exact
)
?
this
.
_arrHeight
[
1
].
value
:
this
.
_arrHeight
[
2
].
value
);
this
.
cmbHeight
.
setValue
((
value
===
Asc
.
linerule_Exact
)
?
this
.
_arrHeight
[
1
].
value
:
this
.
_arrHeight
[
2
].
value
);
this
.
spnHeight
.
setValue
(
Common
.
Utils
.
Metric
.
fnRecalcFromMM
(
frame_props
.
get_H
()));
this
.
spnHeight
.
setValue
(
Common
.
Utils
.
Metric
.
fnRecalcFromMM
(
frame_props
.
get_H
()));
}
else
{
}
else
{
...
...
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