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

Commit 0212315

Browse files
author
Gabriel Schulhof
committed
[navigation] Do not reset the base tag if, during loadPage we find that the page is already in the DOM, or that we have been prevented from continuing because the default for the "pagebeforeload" event has been prevented.
1 parent e517b16 commit 0212315

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

js/jquery.mobile.navigation.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -724,11 +724,6 @@ define( [
724724
}
725725
}
726726

727-
// Reset base to the default document base.
728-
if ( base ) {
729-
base.reset();
730-
}
731-
732727
// If the page we are interested in is already in the DOM,
733728
// and the caller did not indicate that we should force a
734729
// reload of the file, we are done. Otherwise, track the
@@ -772,6 +767,11 @@ define( [
772767
};
773768
}
774769

770+
// Reset base to the default document base.
771+
if ( base ) {
772+
base.reset();
773+
}
774+
775775
if ( !( $.mobile.allowCrossDomainPages || path.isSameDomain( documentUrl, absUrl ) ) ) {
776776
deferred.reject( absUrl, options );
777777
} else {

0 commit comments

Comments
 (0)