FIX: more resilient focus filter or header

discourse · Apr 2, 2018 · d54da51 · d54da51 · discoursebot · Apr 2, 2018
1 parent 017f5c1
commit d54da51
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -67,13 +67,14 @@ export default Ember.Mixin.create({
 
   // try to focus filter and fallback to header if not present
   focusFilterOrHeader() {
+    const context = this;
     // next so we are sure it finised expand/collapse
     Ember.run.next(() => {
       Ember.run.schedule("afterRender", () => {
-        if (!this.$filterInput().is(":visible")) {
-          this.$header().focus();
+        if (!context.$filterInput() || !context.$filterInput().is(":visible")) {
+          context.$header().focus();
         } else {
-          this.$filterInput().focus();
+          context.$filterInput().focus();
         }
       });
     });