Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify history.js to match current W3C popState event semantics (uncompresses only) #137

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modify history.js to match current W3C popState event semantics (uncompresses only) #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ed23c3
From current draft .. referring ti pushState and replaceState ...
Dec 8, 2011
1f8f2ea
Was too aggressive in "was_expected"
Jan 11, 2012
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
View file
Open in desktop
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