Toolbar: removing popup removes page-header-fixed class

Fixes jquery-archivegh-6987 Fixes jquery-archivegh-6939
cgack · Aug 28, 2014 · f7fefb9 · f7fefb9
1 parent 2a90b14
commit f7fefb9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/js/widgets/fixedToolbar.js b/js/widgets/fixedToolbar.js
@@ -277,28 +277,22 @@ define( [ "jquery", "../widget", "../core", "../animationComplete", "../navigati
 		},
 
 		_destroy: function() {
-			var pageClasses, toolbarClasses, header, hasFixedChildren,
+			var pageClasses, toolbarClasses, hasFixedChildren,
 				page = ( !!this.page ) ?
 						this.page : ( $( ".ui-page-active" ).length > 0 ) ?
 						$( ".ui-page-active" ) : $( ".ui-page" ).eq(0);
 
-
 			this._super();
 			if ( this.options.position === "fixed" ) {
-				header = this.role === "header";
-				hasFixedChildren = this.element
-										.closest( ".ui-page" )
-										.children( ".ui-header-fixed" )
+				hasFixedChildren = $.mobile.document.find( ".ui-header-fixed" )
 										.length > 0;
-				page.css( "padding-" + ( header ? "top" : "bottom" ), "" );
 				toolbarClasses =  "ui-header-fixed ui-footer-fixed ui-header-fullscreen in out";
 				toolbarClasses += " ui-footer-fullscreen fade slidedown slideup ui-fixed-hidden";
 				this.element.removeClass( toolbarClasses );
-				pageClasses = "ui-page-header-fullscreen ui-page-footer-fullscreen";
+				pageClasses = "ui-page-" + this.role + "-fullscreen";
 				if ( !hasFixedChildren ) {
-					pageClasses += " ui-page-footer-fixed ui-page-header-fixed";
+					pageClasses += " ui-page-" + this.role + "-fixed";
 				}
-
 				page.removeClass( pageClasses );
 			}
 		}

diff --git a/js/widgets/toolbar.js b/js/widgets/toolbar.js
@@ -115,12 +115,13 @@ define( [
 			var options = this.options,
 				theme = options.backBtnTheme || options.theme;
 
-			$( "<a role='button' href='javascript:void(0);' " +
+			this.backButton = $( "<a role='button' href='javascript:void(0);' " +
 				"class='ui-btn ui-corner-all ui-shadow ui-btn-left " +
 					( theme ? "ui-btn-" + theme + " " : "" ) +
 					"ui-toolbar-back-btn ui-icon-carat-l ui-btn-icon-left' " +
-				"data-" + $.mobile.ns + "rel='back'>" + options.backBtnText + "</a>" )
-					.prependTo( this.element );
+				"data-" + $.mobile.ns + "rel='back'>" + options.backBtnText + "</a>" );
+
+			this.backButton.prependTo( this.element );
 		},
 		_addHeadingClasses: function() {
 			this.element.children( "h1, h2, h3, h4, h5, h6" )
@@ -140,8 +141,11 @@ define( [
 				.removeAttr( "aria-level" );
 
 			if ( this.role === "header" ) {
-				this.element.children( "a, button" ).removeClass( "ui-btn-left ui-btn-right" );
-				this.element.find( ".ui-toolbar-back-btn" ).remove();
+				this.element.children( "a, button" )
+					.removeClass( "ui-btn-left ui-btn-right ui-btn ui-shadow ui-corner-all" );
+				if ( this.backButton ) {
+					this.backButton.remove();
+				}
 			}
 
 			if ( this.options.theme !== undefined ) {

diff --git a/tests/unit/toolbar/index.html b/tests/unit/toolbar/index.html
@@ -58,4 +58,4 @@ <h1>External Footer</h1>
     </div>
 
 </body>
-</html>
+</html>
diff --git a/tests/unit/toolbar/toolbar_core.js b/tests/unit/toolbar/toolbar_core.js
@@ -87,4 +87,4 @@
         ok( $.testHelper.domEqual( headerClone, unEnhancedHeader), "headers match after destroy" );
      });
 
-})(jQuery);
+})(jQuery);