diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-07 11:25:59 +0100 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-10-13 20:39:04 -0400 |
| commit | e8901b20e9c07ae2654e267e5e88c0aa3476835d (patch) | |
| tree | 2cf50113f4cf39556549b1a8ecf8fabf127896bc | |
| parent | ba4e6376e1a6284286d2af46a9f5f1afa6382fd0 (diff) | |
| download | gitlab-ce-e8901b20e9c07ae2654e267e5e88c0aa3476835d.tar.gz | |
Changed trigger keyup to input
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index e94e7cd8be8..b7a70fab74e 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -25,7 +25,7 @@ return function(e) { e.preventDefault(); e.stopPropagation(); - return _this.input.val('').trigger('keyup').focus(); + return _this.input.val('').trigger('input').focus(); }; })(this)); // Key events @@ -38,8 +38,6 @@ } }) .on('input', function(e) { - var keyCode; - keyCode = e.which; if (this.input.val() !== "" && !$inputContainer.hasClass(HAS_VALUE_CLASS)) { $inputContainer.addClass(HAS_VALUE_CLASS); } else if (this.input.val() === "" && $inputContainer.hasClass(HAS_VALUE_CLASS)) { @@ -252,7 +250,7 @@ _this.fullData = data; _this.parseData(_this.fullData); if (_this.options.filterable && _this.filter && _this.filter.input) { - return _this.filter.input.trigger('keyup'); + return _this.filter.input.trigger('input'); } }; // Remote data @@ -484,7 +482,7 @@ // Triggering 'keyup' will re-render the dropdown which is not always required // specially if we want to keep the state of the dropdown needed for bulk-assignment if (!this.options.persistWhenHide) { - $input.trigger("keyup"); + $input.trigger("input"); } if (this.dropdown.find(".dropdown-toggle-page").length) { $('.dropdown-menu', this.dropdown).removeClass(PAGE_TWO_CLASS); |