diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-07 17:59:10 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-07 17:59:10 -0400 |
| commit | dbf9ccbcfe788beb24cda34b0d86b7e12ecdf4bb (patch) | |
| tree | 682860207f02713f2c3b3438d2317bde51a85f8f | |
| parent | fcf99d0d09d63d0662290658ebc1e366bfc11bf0 (diff) | |
| download | gitlab-ce-rs-quick-submit.tar.gz | |
Check originalEvent.repeat *and* event.repeatrs-quick-submit
phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests
were failing on CI
| -rw-r--r-- | app/assets/javascripts/behaviors/quick_submit.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/behaviors/quick_submit_spec.js.coffee | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/behaviors/quick_submit.js.coffee b/app/assets/javascripts/behaviors/quick_submit.js.coffee index 0748eed763c..4ec8531d580 100644 --- a/app/assets/javascripts/behaviors/quick_submit.js.coffee +++ b/app/assets/javascripts/behaviors/quick_submit.js.coffee @@ -14,7 +14,7 @@ # </form> # $(document).on 'keydown.quick_submit', '.js-quick-submit', (e) -> - return if e.originalEvent.repeat + return if (e.originalEvent && e.originalEvent.repeat) || e.repeat return unless e.keyCode == 13 # Enter if navigator.userAgent.match(/Macintosh/) diff --git a/spec/javascripts/behaviors/quick_submit_spec.js.coffee b/spec/javascripts/behaviors/quick_submit_spec.js.coffee index fd20f674746..09708c12ed4 100644 --- a/spec/javascripts/behaviors/quick_submit_spec.js.coffee +++ b/spec/javascripts/behaviors/quick_submit_spec.js.coffee @@ -67,7 +67,4 @@ describe 'Quick Submit behavior', -> else defaults = { keyCode: 13, ctrlKey: true } - args = $.extend({}, defaults, options) - originalEvent = new KeyboardEvent('keydown', args) - - $.Event('keydown', $.extend({}, args, {originalEvent: originalEvent})) + $.Event('keydown', $.extend({}, defaults, options)) |