Merge pull request #405 from mikezielonka/master

jasny · jasny · commit ade9f4826b87 · 2015-12-05T16:57:56.000-04:00
fixes issues #309
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

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`
`36`	`36`	`if (this.options.autohide && !this.options.modal) {`
`37`	`37`	`var eventName = (navigator.userAgent.match(/(iPad\|iPhone)/i) === null) ? 'click' : 'touchstart'`
`38`		`- $(document).on(eventName, $.proxy(this.autohide, this))`
	`38`	`+ $(document).on('click touchstart', $.proxy(this.autohide, this))`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (this.options.toggle) this.toggle()`
`@@ -324,6 +324,8 @@`
`324`	`324`
`325`	`325`	`OffCanvas.prototype.autohide = function (e) {`
`326`	`326`	`if ($(e.target).closest(this.$element).length === 0) this.hide()`
	`327`	`+ var target = $(e.target);`
	`328`	`+ if (!target.hasClass('dropdown-backdrop') && $(e.target).closest(this.$element).length === 0) this.hide()`
`327`	`329`	`}`
`328`	`330`
`329`	`331`	`// OFFCANVAS PLUGIN DEFINITION`