Navbar: Changed active state logic. Fixes #5707

Removed workaround for #1181. Fixed that issue by addressing the actual cause: event.target returns ui-btn-inner instead of the anchor

Author: jaspermdegroot

js/widgets/navbar.js

@@ -38,14 +38,12 @@ $.widget( "mobile.navbar", $.mobile.widget, {
 		});
 
 		$navbar.delegate( "a", "vclick", function( event ) {
-			if ( !$(event.target).hasClass( "ui-disabled" ) ) {
+			// ui-btn-inner is returned as target
+			var target = $( event.target ).is( "a" ) ? $( this ) : $( this ).parent( "a" );
+			
+			if ( !target.is( ".ui-disabled, .ui-btn-active" ) ) {
 				$navbtns.removeClass( $.mobile.activeBtnClass );
-				$( this ).addClass( $.mobile.activeBtnClass );
-				// The code below is a workaround to fix #1181. We have to see why removeActiveLinkClass() doesn't take care of it.
-				var activeNavbtn = $( this );
-				$( document ).one( "pagechange", function( event ) {
-					activeNavbtn.removeClass( $.mobile.activeBtnClass );
-				});
+				target.addClass( $.mobile.activeBtnClass );
 			}
 		});