Bug #2079 » progressive_suppress_wtd_20130730a.diff
| src/web/WebRenderer.C | ||
|---|---|---|
|
script.setVar("INDICATOR_TIMEOUT", conf.indicatorTimeout());
|
||
|
script.setVar("SERVER_PUSH_TIMEOUT", conf.serverPushTimeout() * 1000);
|
||
|
script.setVar("RELOAD_IS_NEWSESSION", conf.reloadIsNewSession());
|
||
|
/*
|
||
|
* Was in honor of Mozilla Bugzilla #246651
|
||
| src/web/skeleton/Wt.js | ||
|---|---|---|
|
},
|
||
|
navigate: function (state, generateEvent) {
|
||
|
function search_wtd() {
|
||
|
var search = window.location.search;
|
||
|
if (_$_RELOAD_IS_NEWSESSION_$_) {
|
||
|
var re1 = /([?&])wtd=\w*&?/;
|
||
|
search = search.replace(re1, "$1");
|
||
|
if (search == "?")
|
||
|
search = "";
|
||
|
}
|
||
|
return search;
|
||
|
}
|
||
|
WT.resolveRelativeAnchors();
|
||
|
currentState = state;
|
||
| ... | ... | |
|
var url = baseUrl + gentleURIEncode(state);
|
||
|
if (baseUrl.length < 3 || baseUrl.substr(baseUrl.length - 3) != "?_=") {
|
||
|
url += window.location.search;
|
||
|
url += search_wtd();
|
||
|
} else {
|
||
|
function stripHashParameter(q) {
|
||
|
if (q.length > 1)
|
||
| ... | ... | |
|
return q;
|
||
|
}
|
||
|
var q = stripHashParameter(window.location.search);
|
||
|
var q = stripHashParameter(search_wtd());
|
||
|
if (q.length > 1) {
|
||
|
if (q.length > 2 && q[0] == '?' && q[1] == '&')
|
||