Skip to content

Prevent Safari 5.0.x poll from interfering with pushState until hash change propagates #150

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

Closed
wants to merge 3 commits into from
Closed

Prevent Safari 5.0.x poll from interfering with pushState until hash change propagates #150

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45f3034
Fix safari poll timing bug during pushState
Jan 19, 2012
0145f47
add guard for pushState occurring while already waiting for propagation
Jan 20, 2012
caec51b
fix storeState and getIdByUrl for Safari 5.0.x
Jan 21, 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
41 changes: 36 additions & 5 deletions scripts/uncompressed/history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
baseHref = baseElement.href.replace(/[^\/]+$/,'');
}

// Adjust trailing slash
// Adjusts trailing slash
baseHref = baseHref.replace(/\/+$/,'');
if ( baseHref ) baseHref += '/';

Expand Down Expand Up @@ -895,7 +895,9 @@
*/
History.getIdByUrl = function(url){
// Fetch
var id = History.urlToId[url] || History.store.urlToId[url] || undefined;
var unescaped = History.unescapeString(url);
var id = History.urlToId[url] || History.store.urlToId[url] ||
History.urlToId[unescaped] || History.store.urlToId[unescaped] || undefined;

// Return
return id;
Expand Down Expand Up @@ -948,7 +950,9 @@
*/
History.storeState = function(newState){
// Store the State
History.urlToId[newState.url] = newState.id;
History.urlToId[newState.cleanUrl] = newState.id;
History.idToState[newState.id] = newState;
History.stateToId[History.getStateString(newState)] = newState.id;

// Push the State
History.storedStates.push(History.cloneObject(newState));
Expand Down Expand Up @@ -1442,8 +1446,12 @@
* @return {History}
*/
History.safariStatePoll = function(){
// Poll the URL
// check if we just pushed state, if so.. bail
if (History.waitForPropagation) {
return;
}

// Poll the URL
// Get the Last State which has the new URL
var
urlState = History.extractState(document.location.href),
Expand Down Expand Up @@ -1472,6 +1480,23 @@
return History;
};

History.blockSafariPollUntilPropagation = function(newState){
// clear existing interval in preparation for the new one
if (History.waitForPropagationInterval) {
clearInterval(History.waitForPropagationInterval);
}
History.waitForPropagation = true;
History.waitForPropagationInterval = setInterval(function() {
var urlState = History.extractState(document.location.href);
if (!urlState || (urlState.id == newState.id)) {
//History.debug('url state propagated, un-blocking Safari poll');
History.waitForPropagation = false;
clearInterval(History.waitForPropagationInterval);
}
}, 250);
History.intervalList.push(History.waitForPropagationInterval);
};


// ====================================================================
// State Aliases
Expand Down Expand Up @@ -1613,7 +1638,7 @@
// Reset the double check
History.doubleCheckComplete();

// Check for a Hash, and handle apporiatly
// Check for a Hash, and handle appropriately
currentHash = History.getHash();
if ( currentHash ) {
// Expand Hash
Expand Down Expand Up @@ -1732,6 +1757,11 @@
History.storeState(newState);
History.expectedStateId = newState.id;

if (History.bugs.safariPoll) {
//History.debug('Blocking safariPoll until url state propagation');
History.blockSafariPollUntilPropagation(newState);
}

// Push the newState
history.pushState(newState.id,newState.title,newState.url);

Expand Down Expand Up @@ -1908,6 +1938,7 @@
* Setup Safari Fix
*/
if ( History.bugs.safariPoll ) {
History.waitForPropagation = false;
History.intervalList.push(setInterval(History.safariStatePoll, History.options.safariPollInterval));
}

Expand Down