Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Merge branch 'fix-5118'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Schulhof committed Oct 2, 2012
2 parents b49cc06 + 729b73b commit 00d82c0
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions js/widgets/popup.js
Expand Up @@ -736,13 +736,7 @@ define( [ "jquery",
return;
}

// if the current url has no dialog hash key proceed as normal
// otherwise, if the page is a dialog simply tack on the hash key
if ( url.indexOf( hashkey ) === -1 && !currentIsDialog ){
url = url + hashkey;
} else {
url = $.mobile.path.parseLocation().hash + hashkey;
}
url = url + hashkey;

// Tack on an extra hashkey if this is the first page and we've just reconstructed the initial hash
if ( urlHistory.activeIndex === 0 && url === urlHistory.initialDst ) {
Expand Down

0 comments on commit 00d82c0

Please sign in to comment.