Merge branch 'refs/heads/master' into gh-pages

acolangelo · Nov 5, 2012 · b08171e · b08171e
2 parents 5d3783f + 32f98d5
commit b08171e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/docs/js/lib/jPanelMenu-1.0.0.min.js b/docs/js/lib/jPanelMenu-1.0.0.min.js
diff --git a/docs/js/script.min.js b/docs/js/script.min.js
diff --git a/jPanelMenu-1.0.0.js b/jPanelMenu-1.0.0.js
@@ -426,17 +426,11 @@
 
 			initiateContentClickListeners: function() {
 				$(document).on('click',jP.panel,function(e){
-					if ( jP.menuIsOpen() )
-					{
-						if ( !$(e.target).hasClass('menu-trigger') ) { jP.closeMenu(jP.options.animated); }
-					}
+					if ( jP.menuIsOpen() ) jP.closeMenu(jP.options.animated);
 				});
 
 				$(document).on('touchend',jP.panel,function(e){
-					if ( jP.menuIsOpen() )
-					{
-						if ( !$(e.target).hasClass('menu-trigger') ) { jP.closeMenu(jP.options.animated); }
-					}
+					if ( jP.menuIsOpen() ) jP.closeMenu(jP.options.animated);
 				});
 			},