Page.dialog: remove close function and isClosable prop use regular ba…

…ck button Fixes #6609 - widgets/page.dialog: Remove function close() and modify "Back" button to have data-rel="back"

js/widgets/page.dialog.js

@@ -28,7 +28,6 @@ $.widget( "mobile.page", $.mobile.page, {
 		if ( this.options.dialog ) {
 
 			$.extend( this, {
-				_isCloseable: false,
 				_inner: this.element.children(),
 				_headerCloseButton: null
 			});
@@ -115,35 +114,16 @@ $.widget( "mobile.page", $.mobile.page, {
 		} else {
 			dst = this._inner.find( ":jqmData(role='header')" ).first();
 			btn = $( "<a></a>", {
-					"role": "button",
 					"href": "#",
 					"class": "ui-btn ui-corner-all ui-icon-delete ui-btn-icon-notext ui-btn-" + location
 				})
+				.attr( "data-" + $.mobile.ns + "rel", "back" )
 				.text( text || this.options.closeBtnText || "" )
 				.prependTo( dst );
 			this._on( btn, { click: "close" } );
 		}
 
 		this._headerCloseButton = btn;
-	},
-
-	// Close method goes back in history
-	close: function() {
-		var idx, dst, hist = $.mobile.navigate.history;
-
-			if ( $.mobile.hashListeningEnabled && hist.activeIndex > 0 ) {
-				$.mobile.back();
-			} else {
-				idx = Math.max( 0, hist.activeIndex - 1 );
-				dst = hist.stack[ idx ].pageUrl || hist.stack[ idx ].url;
-				hist.previousIndex = hist.activeIndex;
-				hist.activeIndex = idx;
-				if ( !$.mobile.path.isPath( dst ) ) {
-					dst = $.mobile.path.makeUrlAbsolute( "#" + dst );
-				}
-
-				$.mobile.changePage( dst, { direction: "back", changeHash: false, fromHashChange: true } );
-			}
 	}
 });
 

tests/integration/dialog-extension/dialog_events.js

@@ -13,7 +13,7 @@
 	});
 
 	asyncTest( "Test option data-close-btn", function() {
-		expect( 7 );
+		expect( 5 );
 
 		$.testHelper.pageSequence([
 			function() {
@@ -29,15 +29,11 @@
 				a = $( "#close-btn-test .ui-header a" );
 				deepEqual( a.length, 1, "The dialog header has eactly one anchor element when the option value is set to 'left'" );
 				ok( a.hasClass( "ui-btn-left" ), "The close button has class ui-btn-left when the closeBtn option is set to 'left'" );
-				deepEqual( a.attr( "role" ), "button", "The close button has the attribute " + '"' + "role='button'" + '"' + "set" );
-
 				$( "#close-btn-test" ).page( "option", "closeBtn", "right" );
 				a = $( "#close-btn-test .ui-header a" );
 				deepEqual( a.length, 1, "The dialog header has eactly one anchor element when the option value is set to 'right'" );
 				ok( a.hasClass( "ui-btn-right" ), "The close button has class ui-btn-right when the closeBtn option is set to 'right'" );
-				deepEqual( a.attr( "role" ), "button", "The close button has the attribute " + '"' + "role='button'" + '"' + "set" );
 
-
 			},
 
 			function() {