Panel: Ignore click event whose default has been prevented

Check whether the default on the event that would close the panel has been
prevented, and ignore it if so.

Fixes jquery-archivegh-6693

Author: Gabriel Schulhof

js/widgets/panel.js

@@ -145,16 +145,27 @@ $.widget( "mobile.panel", {
 		this.element.addClass( this._getPanelClasses() );
 	},
 
-	_bindCloseEvents: function() {
-		var self = this;
-
-		self._closeLink.on( "click.panel" , function( e ) {
-			e.preventDefault();
-			self.close();
+	_handleCloseClickAndEatEvent: function( event ) {
+		if ( !event.isDefaultPrevented() ) {
+			event.preventDefault();
+			this.close();
 			return false;
+		}
+	},
+
+	_handleCloseClick: function( event ) {
+		if ( !event.isDefaultPrevented() ) {
+			this.close();
+		}
+	},
+
+	_bindCloseEvents: function() {
+		this._on( this._closeLink, {
+			"click": "_handleCloseClick"
 		});
-		self.element.on( "click.panel" , "a:jqmData(ajax='false')", function(/* e */) {
-			self.close();
+
+		this._on({
+			"click a:jqmData(ajax='false')": "_handleCloseClick"
 		});
 	},
 
@@ -475,8 +486,6 @@ $.widget( "mobile.panel", {
 			.off( "updatelayout" )
 			.off( this._transitionEndEvents );
 
-		this._closeLink.off( "click.panel" );
-
 		if ( this._modal ) {
 			this._modal.remove();
 		}

tests/unit/panel/index.html

@@ -67,7 +67,9 @@
 			<p>Contents of a panel.</p>
 			<a href="#demo-links" data-nstest-rel="close" data-nstest-role="button">Close panel</a>
 		</div>
-
+		<div data-nstest-role="panel" id="panel-test-ignore-unrelated-link">
+			<a href="#" id="unrelated-link" data-nstest-ajax="false">Unrelated link</a>
+		</div>
 		<div data-nstest-role="header">
 			<h1>Panel Test</h1>
 		</div>

tests/unit/panel/panel_core.js

@@ -284,4 +284,46 @@
 		$panel.panel( "open" );
 	});
 
+	// Test for https://github.com/jquery/jquery-mobile/issues/6693
+	asyncTest( "unrelated link does not close the panel", function() {
+		var panel = $( "#panel-test-ignore-unrelated-link" ),
+			eventNs = ".ignoreUnrelatedLinkClick";
+
+		$( "#unrelated-link" ).one( "click", function( event ) {
+			event.preventDefault();
+		});
+
+		$.testHelper.detailedEventCascade([
+			function() {
+				panel.panel( "open" );
+			},
+
+			{
+				panelopen: { src: panel, event: "panelopen" + eventNs + "1" }
+			},
+
+			function( result ) {
+				deepEqual( result.panelopen.timedOut, false,
+					"Panel opened successfully" );
+				$( "#unrelated-link" ).click();
+			},
+
+			{
+				panelclose: { src: panel, event: "panelclose" + eventNs + "2" }
+			},
+
+			function( result ) {
+				deepEqual( result.panelclose.timedOut, true,
+					"Panel did not close in response to unrelated click" );
+				panel.panel( "close" );
+			},
+
+			{
+				panelclose: { src: panel, event: "panelclose" + eventNs + "3" }
+			},
+
+			start
+		]);
+	});
+
 }( jQuery ));