Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions scripts/uncompressed/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@
*/
History.onPopState = function(event,extra){
// Prepare
var stateId = false, newState = false, currentHash, currentState;
var stateId = false, newState = false, currentHash, currentState, wasExpected;

// Reset the double check
History.doubleCheckComplete();
Expand Down Expand Up @@ -1647,6 +1647,7 @@
else if ( History.expectedStateId ) {
// Vanilla: A new state was pushed, and popstate was called manually
newState = History.getStateById(History.expectedStateId);
wasExpected = !! newState;
}
else {
// Initial State
Expand Down Expand Up @@ -1677,8 +1678,10 @@
// Force update of the title
History.setTitle(newState);

// Fire Our Event
History.Adapter.trigger(window,'statechange');
// Fire Our Event .. match popstate semantics
if ( ! wasExpected )
History.Adapter.trigger(window,'statechange');

History.busy(false);

// Return true
Expand Down