Merge pull request #405 from mikezielonka/master

fixes issues #309
jasny · Dec 5, 2015 · ade9f48 · ade9f48
2 parents 4e27c63 + e9505f2
commit ade9f48
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/js/offcanvas.js b/js/offcanvas.js
@@ -35,7 +35,7 @@
 
     if (this.options.autohide && !this.options.modal) {
       var eventName = (navigator.userAgent.match(/(iPad|iPhone)/i) === null) ? 'click' : 'touchstart'
-      $(document).on(eventName, $.proxy(this.autohide, this))
+      $(document).on('click touchstart', $.proxy(this.autohide, this))
     }
 
     if (this.options.toggle) this.toggle()
@@ -324,6 +324,8 @@
 
   OffCanvas.prototype.autohide = function (e) {
     if ($(e.target).closest(this.$element).length === 0) this.hide()
+    var target = $(e.target);
+    if (!target.hasClass('dropdown-backdrop') && $(e.target).closest(this.$element).length === 0) this.hide()
   }
 
   // OFFCANVAS PLUGIN DEFINITION