Commit 314c2d51 authored by Stan Hu's avatar Stan Hu

Merge branch 'gl-dropdown-fix' into 'ce-to-ee'

Check if selected object is valid before passing to calback

See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/974#note_20210158

See merge request !977
parents e707ffe6 075fc587
......@@ -343,16 +343,18 @@
selector = ".dropdown-page-one .dropdown-content a";
}
this.dropdown.on("click", selector, function(e) {
var $el, selected;
var $el, selected, selectedObj, isMarking;
$el = $(this);
selected = self.rowClicked($el);
selectedObj = selected ? selected[0] : null;
isMarking = selected ? selected[1] : null;
if (self.options.clicked) {
self.options.clicked(selected[0], $el, e, selected[1]);
self.options.clicked(selectedObj, $el, e, isMarking);
}
// Update label right after all modifications in dropdown has been done
if (self.options.toggleLabel) {
self.updateLabel(selected[0], $el, self);
self.updateLabel(selectedObj, $el, self);
}
$el.trigger('blur');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment