Toolbar: removing popup removes page-header-fixed class

Fixes gh-6987
Fixes gh-6939

Author: cgack

js/widgets/fixedToolbar.js

@@ -277,19 +277,22 @@ define( [ "jquery", "../widget", "../core", "../animationComplete", "../navigati
 		},
 
 		_destroy: function() {
-			var $el = this.element,
+			var classes,
+				$el = this.element,
 				header = $el.hasClass( "ui-header" ),
-				hasFixedChildren = $el.closest( ".ui-page" ).children( ".ui-header-fixed" ).length > 0;
+				hasFixedChildren = $el
+										.closest( ".ui-page" )
+										.children( ".ui-header-fixed" )
+										.length > 0;
 
 			$el.closest( ".ui-page" ).css( "padding-" + ( header ? "top" : "bottom" ), "" );
 			$el.removeClass( "ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden" );
-			$el.closest( ".ui-page" ).removeClass( "ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen" );
-			
+			classes = "ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen";
 			if ( !hasFixedChildren ) {
-
-				$el.closest( ".ui-page" ).removeClass( "ui-page-header-fixed" );
-
+				classes += "ui-page-header-fixed";
 			}
+
+			$el.closest( ".ui-page" ).removeClass( classes );
 		}
 
 	});

tests/integration/fixed-toolbar/fixedToolbar.js

@@ -317,37 +317,39 @@
 	asyncTest( "page-retains-fixed-header-on-popup-remove" , function() {
 		expect( 1 );
 
-		var pageSelector = "#page-retains-fixed-header-on-popup-removed";
+		var page = $( "#page-retains-fixed-header-on-popup-removed" ).page();
 
 		$.testHelper.pageSequence([
 			function() {
-				$.mobile.changePage( pageSelector );
+				$.mobile.pageContainer.change( page );
 			},
 
 			function() {
-				var $page = $( pageSelector ),
-						$popup;
+				var popup;
 
-				$popup = $( "<div data-nstest-role='popup' />" )
+				popup = $( "<div data-nstest-role='popup' />" )
 									.append( "<div data-nstest-role='header' />" )
 									.append( "<h1>Dynamic Popup</h1>" );
 
-				$page.append( $popup );
+				page.append( popup );
 
-				$popup.popup( { positionTo: "window" } ).trigger( "create" );
+				popup.popup( { positionTo: "window" } ).trigger( "create" );
 
-				$popup.on( "popupafterclose", function() {
-					$popup.remove();
-					ok( $.mobile.activePage.hasClass( "ui-page-header-fixed" ), "page should retain the fixed header after popup is removed" );
+				popup.on( "popupafterclose", function() {
+					popup.remove();
+					ok( $.mobile.pageContainer.
+						pagecontainer( "getActivePage" )
+						.hasClass( "ui-page-header-fixed" ),
+						"page should retain the fixed header after popup is removed" );
 					start();
 				});
 
-				$popup.popup( "open" ).popup( "close" );
+				popup.popup( "open" ).popup( "close" );
 			},
 
 			function() {
 
-				$.mobile.changePage( "#default" );
+				$.mobile.pageContainer.change( "#default" );
 
 			}
 		]);