Reviewers: jlabanca,
Please review this at http://gwt-code-reviews.appspot.com/64803 Affected files: M user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java Index: user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java diff --git a/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java b/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java index 0d73ba5afcb1e9d33db50a1b0e96bfd9f05b22a8..532cdd11a0e95e122bc91dfde38aa7cd8b5fbb94 100644 --- a/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java +++ b/user/src/com/google/gwt/user/client/impl/HistoryImplIE6.java @@ -85,7 +85,6 @@ class HistoryImplIE6 extends HistoryImpl { } injectGlobalHandler(); - initUrlCheckTimer(); return true; } @@ -140,43 +139,6 @@ class HistoryImplIE6 extends HistoryImpl { @com.google.gwt.user.client.impl.HistoryImpl::setToken(Ljava/lang/String;)(token); }-*/; - private native void initUrlCheckTimer() /*-{ - // This is the URL check timer. It detects when an unexpected change - // occurs in the document's URL (e.g. when the user enters one manually - // or selects a 'favorite', but only the #hash part changes). When this - // occurs, we _must_ reload the page. This is because IE has a really - // nasty bug that totally mangles its history stack and causes the location - // bar in the UI to stop working under these circumstances. - var historyImplRef = this; - var urlChecker = function() { - $wnd.setTimeout(urlChecker, 250); - - // Reset the hash if the user cancels a window reload triggered by the - // urlChecker. - if ([email protected]::handleWindowReloadCanceled()()) { - return; - } - - var hash = @com.google.gwt.user.client.impl.HistoryImplIE6::getLocationHash()(); - if (hash.length > 0) { - var token = ''; - try { - token = [email protected]::decodeFragment(Ljava/lang/String;)(hash.substring(1)); - } catch (e) { - // If there's a bad hash, always reload. This could only happen if - // if someone entered or linked to a bad url. - [email protected]::reloadWindow()(); - } - - var historyToken = @com.google.gwt.user.client.impl.HistoryImpl::getToken()(); - if (historyToken && (token != historyToken)) { - [email protected]::reloadWindow()(); - } - } - }; - urlChecker(); - }-*/; - private native void injectGlobalHandler() /*-{ var historyImplRef = this; --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
