Toolbar: removing popup removes page-header-fixed class

Adds _destroy to toolbar.js and _super() for fixedToolbar Fixes jquery-archivegh-6987 Fixes jquery-archivegh-6939
cgack · Jun 6, 2014 · 95579f0 · 95579f0
1 parent 50e7c8b
commit 95579f0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/js/widgets/fixedToolbar.js b/js/widgets/fixedToolbar.js
@@ -277,22 +277,29 @@ define( [ "jquery", "../widget", "../core", "../animationComplete", "../navigati
 		},
 
 		_destroy: function() {
-			var classes,
-				toolbar = this.element,
-				header = toolbar.hasClass( "ui-header" ),
+			var pageClasses, toolbarClasses, header, hasFixedChildren,
+				toolbar = this.element;
+
+			this._super();
+			if ( toolbar.css( "postion" ) === "fixed" ) {
+				header = toolbar.hasClass( "ui-header" );
 				hasFixedChildren = toolbar
 										.closest( ".ui-page" )
 										.children( ".ui-header-fixed" )
 										.length > 0;
+				toolbar
+					.closest( ".ui-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";
+				toolbar.removeClass( toolbarClasses );
+				pageClasses = "ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen";
+				if ( !hasFixedChildren ) {
+					pageClasses += "ui-page-header-fixed";
+				}
 
-			toolbar.closest( ".ui-page" ).css( "padding-" + ( header ? "top" : "bottom" ), "" );
-			toolbar.removeClass( "ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden" );
-			classes = "ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen";
-			if ( !hasFixedChildren ) {
-				classes += "ui-page-header-fixed";
+				toolbar.closest( ".ui-page" ).removeClass( pageClasses );
 			}
-
-			toolbar.closest( ".ui-page" ).removeClass( classes );
 		}
 
 	});

diff --git a/js/widgets/toolbar.js b/js/widgets/toolbar.js
@@ -130,6 +130,26 @@ define( [
 					"role": "heading",
 					"aria-level": "1"
 				});
+		},
+		_destroy: function() {
+			var headerAnchors,currentTheme,
+				toolbar = this.element;
+
+			toolbar.children( "h1, h2, h3, h4, h5, h6" )
+				.removeClass( "ui-title" );
+
+			if ( this.role === "header" ) {
+				headerAnchors = toolbar.children( "a, button" );
+				headerAnchors.removeClass( "ui-btn-left ui-btn-right" );
+				toolbar.find( ".ui-toolbar-back-btn" ).remove();
+			}
+
+			if ( this.options.theme !== undefined ) {
+				currentTheme = this.options.theme ? this.options.theme : "inherit";
+				toolbar.removeClass( "ui-bar-" + currentTheme );
+			}
+
+			toolbar.removeClass( "ui-" + this.role );
 		}
 	});