kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Check if selected object is valid before passing to calback

Browse source
This commit is contained in:
Alfredo Sumaran 2016-12-19 00:18:06 -05:00
parent 60f61096e1
commit d80b267731
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/gl_dropdown.js
View file

@ -343,16 +343,18 @@
selector = ".dropdown-page-one .dropdown-content a"; selector = ".dropdown-page-one .dropdown-content a";
} }
this.dropdown.on("click", selector, function(e) { this.dropdown.on("click", selector, function(e) {
var $el, selected; var $el, selected, selectedObj, isMarking;
$el = $(this); $el = $(this);
selected = self.rowClicked($el); selected = self.rowClicked($el);
selectedObj = selected ? selected[0] : null;
isMarking = selected ? selected[1] : null;
if (self.options.clicked) { 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 // Update label right after all modifications in dropdown has been done
if (self.options.toggleLabel) { if (self.options.toggleLabel) {
self.updateLabel(selected[0], $el, self); self.updateLabel(selectedObj, $el, self);
} }
$el.trigger('blur'); $el.trigger('blur');