Toolbar: removing popup removes page-header-fixed class

Fixes gh-6978
Fixes gh-6939

Author: cgack

js/widgets/fixedToolbar.js

@@ -284,12 +284,10 @@ define( [ "jquery", "../widget", "../core", "../animationComplete", "../navigati
 			this._super();
 			if ( this.options.position === "fixed" ) {
 				hasFixed = $(  "body>.ui-" + this.role + "-fixed" )
-							.add( page )
-							.find( ".ui-" + this.options.role + "-fixed" )
+							.add( page.find( ".ui-" + this.options.role + "-fixed" ) )
 							.not( this.element ).length > 0;
 				hasFullscreen = $(  "body>.ui-" + this.role + "-fixed" )
-							.add( page )
-							.find( ".ui-" + this.options.role + "-fullscreen" )
+							.add( page.find( ".ui-" + this.options.role + "-fullscreen" ) )
 							.not( this.element ).length > 0;
 				toolbarClasses =  "ui-header-fixed ui-footer-fixed ui-header-fullscreen in out" +
 					" ui-footer-fullscreen fade slidedown slideup ui-fixed-hidden";

js/widgets/toolbar.js

@@ -148,14 +148,10 @@ define( [
 				}
 			}
 
-			if ( this.options.theme !== undefined ) {
-				currentTheme = this.options.theme ? this.options.theme : "inherit";
-				this.element.removeClass( "ui-bar-" + currentTheme );
-			}
+			currentTheme = this.options.theme ? this.options.theme : "inherit";
+			this.element.removeClass( "ui-bar-" + currentTheme );
 
-			this.element
-				.removeClass( "ui-" + this.role )
-				.removeAttr( "role" );
+			this.element.removeClass( "ui-" + this.role ).removeAttr( "role" );
 		}
 	});