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
9f3c4cc9
Commit
9f3c4cc9
authored
Aug 23, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Fix Bug 32975.
parent
f1d781df
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
33 deletions
+45
-33
apps/common/main/lib/component/Button.js
apps/common/main/lib/component/Button.js
+2
-0
apps/documenteditor/main/app/view/ParagraphSettings.js
apps/documenteditor/main/app/view/ParagraphSettings.js
+1
-0
apps/documenteditor/main/app/view/Toolbar.js
apps/documenteditor/main/app/view/Toolbar.js
+42
-33
No files found.
apps/common/main/lib/component/Button.js
View file @
9f3c4cc9
...
...
@@ -461,6 +461,8 @@ define([
updateHint
:
function
(
hint
)
{
this
.
options
.
hint
=
hint
;
if
(
!
this
.
rendered
)
return
;
var
cmpEl
=
this
.
cmpEl
,
modalParents
=
cmpEl
.
closest
(
'
.asc-window
'
);
...
...
apps/documenteditor/main/app/view/ParagraphSettings.js
View file @
9f3c4cc9
...
...
@@ -395,6 +395,7 @@ define([
},
createDelayedElements
:
function
()
{
this
.
UpdateThemeColors
();
this
.
updateMetricUnit
();
},
...
...
apps/documenteditor/main/app/view/Toolbar.js
View file @
9f3c4cc9
...
...
@@ -694,7 +694,37 @@ define([
id
:
'
id-toolbar-btn-colorschemas
'
,
cls
:
'
btn-toolbar
'
,
iconCls
:
'
btn-colorschemas
'
,
menu
:
true
menu
:
new
Common
.
UI
.
Menu
({
items
:
[],
maxHeight
:
600
,
restoreHeight
:
600
}).
on
(
'
show:before
'
,
function
(
mnu
)
{
if
(
!
this
.
scroller
)
{
this
.
scroller
=
new
Common
.
UI
.
Scroller
({
el
:
$
(
this
.
el
).
find
(
'
.dropdown-menu
'
),
useKeyboard
:
this
.
enableKeyEvents
&&
!
this
.
handleSelect
,
minScrollbarLength
:
40
,
alwaysVisibleY
:
true
});
}
}).
on
(
'
show:after
'
,
function
(
btn
,
e
)
{
var
mnu
=
$
(
this
.
el
).
find
(
'
.dropdown-menu
'
),
docH
=
$
(
document
).
height
(),
menuH
=
mnu
.
outerHeight
(),
top
=
parseInt
(
mnu
.
css
(
'
top
'
));
if
(
menuH
>
docH
)
{
mnu
.
css
(
'
max-height
'
,
(
docH
-
parseInt
(
mnu
.
css
(
'
padding-top
'
))
-
parseInt
(
mnu
.
css
(
'
padding-bottom
'
))
-
5
)
+
'
px
'
);
this
.
scroller
.
update
({
minScrollbarLength
:
40
});
}
else
if
(
mnu
.
height
()
<
this
.
options
.
restoreHeight
)
{
mnu
.
css
(
'
max-height
'
,
(
Math
.
min
(
docH
-
parseInt
(
mnu
.
css
(
'
padding-top
'
))
-
parseInt
(
mnu
.
css
(
'
padding-bottom
'
))
-
5
,
this
.
options
.
restoreHeight
))
+
'
px
'
);
menuH
=
mnu
.
outerHeight
();
if
(
top
+
menuH
>
docH
)
{
mnu
.
css
(
'
top
'
,
0
);
}
this
.
scroller
.
update
({
minScrollbarLength
:
40
});
}
})
});
this
.
toolbarControls
.
push
(
this
.
btnColorSchemas
);
...
...
@@ -735,6 +765,7 @@ define([
this
.
mnuInsertTable
=
this
.
btnInsertTable
.
menu
;
this
.
mnuInsertImage
=
this
.
btnInsertImage
.
menu
;
this
.
mnuPageSize
=
this
.
btnPageSize
.
menu
;
this
.
mnuColorSchema
=
this
.
btnColorSchemas
.
menu
;
//
// DataView and pickers
...
...
@@ -1095,6 +1126,7 @@ define([
this
.
btnColumns
.
updateHint
(
this
.
tipColumns
);
this
.
btnPageOrient
.
updateHint
(
this
.
tipPageOrient
);
this
.
btnPageSize
.
updateHint
(
this
.
tipPageSize
);
this
.
btnPageMargins
.
updateHint
(
this
.
tipPageMargins
);
this
.
btnClearStyle
.
updateHint
(
this
.
tipClearStyle
);
this
.
btnCopyStyle
.
updateHint
(
this
.
tipCopyStyle
+
Common
.
Utils
.
String
.
platformKey
(
'
Ctrl+Shift+C
'
));
this
.
btnColorSchemas
.
updateHint
(
this
.
tipColorSchemas
);
...
...
@@ -1541,40 +1573,17 @@ define([
});
}
if
(
!
this
.
mnuColorSchema
)
{
this
.
btnColorSchemas
.
setMenu
(
new
Common
.
UI
.
Menu
({
items
:
[],
if
(
this
.
mnuColorSchema
==
null
)
{
this
.
mnuColorSchema
=
new
Common
.
UI
.
Menu
({
maxHeight
:
600
,
restoreHeight
:
600
}));
this
.
mnuColorSchema
=
this
.
btnColorSchemas
.
menu
;
this
.
mnuColorSchema
.
on
(
'
show:before
'
,
function
(
mnu
)
{
if
(
!
this
.
scroller
)
{
}).
on
(
'
show:before
'
,
function
(
mnu
)
{
this
.
scroller
=
new
Common
.
UI
.
Scroller
({
el
:
$
(
this
.
el
).
find
(
'
.dropdown-menu
'
),
useKeyboard
:
this
.
enableKeyEvents
&&
!
this
.
handleSelect
,
minScrollbarLength
:
40
,
alwaysVisibleY
:
true
minScrollbarLength
:
40
});
});
}
}).
on
(
'
show:after
'
,
function
(
btn
,
e
)
{
var
mnu
=
$
(
this
.
el
).
find
(
'
.dropdown-menu
'
),
docH
=
Common
.
Utils
.
innerHeight
(),
menuH
=
mnu
.
outerHeight
(),
top
=
parseInt
(
mnu
.
css
(
'
top
'
));
if
(
menuH
>
docH
)
{
mnu
.
css
(
'
max-height
'
,
(
docH
-
parseInt
(
mnu
.
css
(
'
padding-top
'
))
-
parseInt
(
mnu
.
css
(
'
padding-bottom
'
))
-
5
)
+
'
px
'
);
this
.
scroller
.
update
({
minScrollbarLength
:
40
});
}
else
if
(
mnu
.
height
()
<
this
.
options
.
restoreHeight
)
{
mnu
.
css
(
'
max-height
'
,
(
Math
.
min
(
docH
-
parseInt
(
mnu
.
css
(
'
padding-top
'
))
-
parseInt
(
mnu
.
css
(
'
padding-bottom
'
))
-
5
,
this
.
options
.
restoreHeight
))
+
'
px
'
);
menuH
=
mnu
.
outerHeight
();
if
(
top
+
menuH
>
docH
)
{
mnu
.
css
(
'
top
'
,
0
);
}
this
.
scroller
.
update
({
minScrollbarLength
:
40
});
}
})
}
this
.
mnuColorSchema
.
items
=
[];
...
...
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