Merge pull request #329 from kristofdegrave/master

Bugfix: Handle events correct on bootstrap 4 template
bassjobsen · Jan 15, 2018 · e3ae30d · e3ae30d
2 parents a7ba771 + 62a59f4
commit e3ae30d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/bootstrap3-typeahead.js b/bootstrap3-typeahead.js
@@ -379,7 +379,7 @@
       var next = active.next();
 
       if (!next.length) {
-        next = $(this.$menu.find('li')[0]);
+        next = $(this.$menu.find($(this.options.item).prop('tagName'))[0]);
       }
 
       next.addClass('active');
@@ -393,7 +393,7 @@
       var prev = active.prev();
 
       if (!prev.length) {
-        prev = this.$menu.find('li').last();
+        prev = this.$menu.find($(this.options.item).prop('tagName')).last();
       }
 
       prev.addClass('active');
@@ -414,15 +414,16 @@
         this.$element.on('keydown.bootstrap3Typeahead', $.proxy(this.keydown, this));
       }
 
+      var itemTagName = $(this.options.item).prop('tagName')
       if ('ontouchstart' in document.documentElement) {
         this.$menu
-          .on('touchstart', 'li', $.proxy(this.touchstart, this))
-          .on('touchend', 'li', $.proxy(this.click, this));
+          .on('touchstart', itemTagName, $.proxy(this.touchstart, this))
+          .on('touchend', itemTagName, $.proxy(this.click, this));
       } else {
         this.$menu
           .on('click', $.proxy(this.click, this))
-          .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-          .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+          .on('mouseenter', itemTagName, $.proxy(this.mouseenter, this))
+          .on('mouseleave', itemTagName, $.proxy(this.mouseleave, this))
           .on('mousedown', $.proxy(this.mousedown,this));
       }
     },