From 20123271d2a4e903e348a65bdb8a1bae9fca95ac Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 13 Feb 2018 17:48:00 +0100 Subject: [PATCH] FIX: override backspaceFromFilter only if defined --- .../select-kit/components/mini-tag-chooser.js.es6 | 4 ++++ app/assets/javascripts/select-kit/mixins/events.js.es6 | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 index deaae9d01b8..0de5b95894e 100644 --- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -83,6 +83,10 @@ export default ComboBox.extend({ } }, + backspaceFromFilter(event) { + this.didPressBackspace(event); + }, + didPressBackspace() { if (!this.get("isExpanded")) { this.expand(); diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6 index 45edf38577f..253a7664794 100644 --- a/app/assets/javascripts/select-kit/mixins/events.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/events.js.es6 @@ -108,7 +108,9 @@ export default Ember.Mixin.create({ .on("keydown.select-kit", (event) => { const keyCode = event.keyCode || event.which; - if (keyCode === this.keys.BACKSPACE) this.backspaceFromFilter(event); + if (keyCode === this.keys.BACKSPACE && typeof this.backspaceFromFilter === "function") { + this.backspaceFromFilter(event) + }; if (keyCode === this.keys.TAB) this.tabFromFilter(event); if (keyCode === this.keys.ESC) this.escapeFromFilter(event); if (keyCode === this.keys.ENTER) this.enterFromFilter(event); @@ -208,7 +210,6 @@ export default Ember.Mixin.create({ upAndDownFromFilter(event) { this.didPressUpAndDownArrows(event); }, backspaceFromHeader(event) { this.didPressBackspace(event); }, - backspaceFromFilter(event) { this.didPressBackspace(event); }, enterFromHeader(event) { this.didPressEnter(event); }, enterFromFilter(event) { this.didPressEnter(event); },