diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-06 17:15:44 -0500 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-06 17:15:44 -0500 |
commit | 02838d5be2f899793ce5e026f0bb20c509697061 (patch) | |
tree | de3e125ca3f997bb94e079e2d2dbdc879d3dd7c6 /app/assets/javascripts/gl_dropdown.js | |
parent | 035bf5d4d5d3209286aa257cbd56ec6ce9e1afb9 (diff) | |
parent | 3cbab382f678cef273cde319aae55f050d27527d (diff) | |
download | gitlab-ce-02838d5be2f899793ce5e026f0bb20c509697061.tar.gz |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'app/assets/javascripts/gl_dropdown.js')
-rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index ff218ccad62..e8d8fef8579 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -738,7 +738,7 @@ GitLabDropdown = (function() { : selectedObject.id; if (isInput) { field = $(this.el); - } else if (value) { + } else if (value != null) { field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value.toString().replace(/'/g, '\\\'') + "']"); } @@ -746,7 +746,7 @@ GitLabDropdown = (function() { return; } - if (el.hasClass(ACTIVE_CLASS)) { + if (el.hasClass(ACTIVE_CLASS) && value !== 0) { isMarking = false; el.removeClass(ACTIVE_CLASS); if (field && field.length) { @@ -852,7 +852,7 @@ GitLabDropdown = (function() { if (href && href !== '#') { gl.utils.visitUrl(href); } else { - $el.first().trigger('click'); + $el.trigger('click'); } } }; |