If ajax is disabled, exit the click handler early and avoid parsing the href at all. Thanks for the idea, @toddparker! Fixes #1846.

This commit is contained in:
scottjehl 2011-06-17 18:33:16 -04:00
parent b3aa56582c
commit 722ed2cbbf

View file

@ -960,14 +960,25 @@
return; return;
} }
var $link = $( link ); var $link = $( link ),
//remove active link class if external (then it won't be there if you come back)
httpCleanup = function(){
window.setTimeout( function() { removeActiveLinkClass( true ); }, 200 );
};
//if there's a data-rel=back attr, go back in history //if there's a data-rel=back attr, go back in history
if( $link.is( ":jqmData(rel='back')" ) ) { if( $link.is( ":jqmData(rel='back')" ) ) {
window.history.back(); window.history.back();
return false; return false;
} }
//if ajax is disabled, exit early
if( !$.mobile.ajaxEnabled ){
httpCleanup();
//use default click handling
return;
}
var baseUrl = getClosestBaseUrl( $link ), var baseUrl = getClosestBaseUrl( $link ),
//get href, if defined, otherwise default to empty hash //get href, if defined, otherwise default to empty hash
@ -1016,10 +1027,8 @@
$activeClickedLink = $link.closest( ".ui-btn" ); $activeClickedLink = $link.closest( ".ui-btn" );
if( isExternal || !$.mobile.ajaxEnabled ) { if( isExternal ) {
//remove active link class if external (then it won't be there if you come back) httpCleanup();
window.setTimeout( function() { removeActiveLinkClass( true ); }, 200 );
//use default click handling //use default click handling
return; return;
} }