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
6ea59501
Commit
6ea59501
authored
Aug 05, 2016
by
Maxim Kadushkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scroller initialization moved on 'show:before'
parent
00c2b4c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
apps/common/main/lib/component/ComboBox.js
apps/common/main/lib/component/ComboBox.js
+9
-8
apps/common/main/lib/component/ComboBoxFonts.js
apps/common/main/lib/component/ComboBoxFonts.js
+0
-4
No files found.
apps/common/main/lib/component/ComboBox.js
View file @
6ea59501
...
...
@@ -188,14 +188,6 @@ define([
Common
.
NotificationCenter
.
on
(
'
menumanager:hideall
'
,
_
.
bind
(
me
.
closeMenu
,
me
));
this
.
scroller
=
new
Common
.
UI
.
Scroller
(
_
.
extend
({
el
:
$
(
'
.dropdown-menu
'
,
me
.
cmpEl
),
minScrollbarLength
:
40
,
scrollYMarginOffset
:
30
,
includePadding
:
true
},
this
.
options
.
scroller
));
// set default selection
this
.
setDefaultSelection
();
...
...
@@ -233,6 +225,15 @@ define([
},
onBeforeShowMenu
:
function
(
e
)
{
if
(
!
this
.
scroller
)
{
this
.
scroller
=
new
Common
.
UI
.
Scroller
(
_
.
extend
({
el
:
$
(
'
.dropdown-menu
'
,
this
.
cmpEl
),
minScrollbarLength
:
40
,
scrollYMarginOffset
:
30
,
includePadding
:
true
},
this
.
options
.
scroller
));
}
Common
.
NotificationCenter
.
trigger
(
'
menu:show
'
);
this
.
trigger
(
'
show:before
'
,
this
,
e
);
if
(
this
.
options
.
hint
)
{
...
...
apps/common/main/lib/component/ComboBoxFonts.js
View file @
6ea59501
...
...
@@ -112,10 +112,6 @@ define([
this
.
_input
.
on
(
'
keyup
'
,
_
.
bind
(
this
.
onInputKeyUp
,
this
));
this
.
_input
.
on
(
'
keydown
'
,
_
.
bind
(
this
.
onInputKeyDown
,
this
));
setTimeout
(
function
(
me
){
me
.
scroller
.
update
();
},
30
,
this
);
return
this
;
},
...
...
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