From 12beb77afaa3fe554ebdf97a67615dce05e2299f Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 21 Nov 2017 19:08:59 +0100 Subject: [PATCH] FIX: make sure the element exists before calling `off` This commit fixes an issue happening only when running tests under `/qunit` and not with `rake qunit:test` --- .../select-kit/mixins/events.js.es6 | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6 index fa2bce870f..3d0a04a18a 100644 --- a/app/assets/javascripts/select-kit/mixins/events.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/events.js.es6 @@ -19,18 +19,22 @@ export default Ember.Mixin.create({ .off("mousedown.select-kit") .off("touchstart.select-kit"); - this.$header() - .off("focus.select-kit") - .off("blur.select-kit") - .off("keypress.select-kit") - .off("keydown.select-kit"); + if (this.$header()) { + this.$header() + .off("focus.select-kit") + .off("blur.select-kit") + .off("keypress.select-kit") + .off("keydown.select-kit"); + } - this.$filterInput() - .off("change.select-kit") - .off("keydown.select-kit") - .off("keypress.select-kit") - .off("focus.select-kit") - .off("focusin.select-kit"); + if (this.$filterInput()) { + this.$filterInput() + .off("change.select-kit") + .off("keydown.select-kit") + .off("keypress.select-kit") + .off("focus.select-kit") + .off("focusin.select-kit"); + } }, didInsertElement() {