wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 424251 - "pageproxystate set to valid when selecting an autocomplete result" (use a helper function) [p=dao@mozilla.com (Dão Gottwald) r=gavin a=blocking-firefox3+]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-03-28 01:45:18 -07:00
parent b1b25c0f1f
commit 89550bc0c9
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
browser/base/content/browser.js
View File

@ -1950,11 +1950,11 @@ function checkForDirectoryListing()
}
}
function URLBarSetURI(aURI, aMustUseURI) {
function URLBarSetURI(aURI) {
var value = getBrowser().userTypedValue;
var state = "invalid";
if (!value || aMustUseURI) {
if (!value) {
if (aURI) {
// If the url has "wyciwyg://" as the protocol, strip it off.
// Nobody wants to see it on the urlbar for dynamically generated
@ -1969,33 +1969,12 @@ function URLBarSetURI(aURI, aMustUseURI) {
aURI = getWebNavigation().currentURI;
}
value = aURI.spec;
if (value == "about:blank") {
if (aURI.spec == "about:blank") {
// Replace "about:blank" with an empty string
// only if there's no opener (bug 370555).
if (!content.opener)
value = "";
value = content.opener ? aURI.spec : "";
} else {
// Try to decode as UTF-8 if there's no encoding sequence that we would break.
if (!/%25(?:3B|2F|3F|3A|40|26|3D|2B|24|2C|23)/i.test(value))
try {
value = decodeURI(value)
// 1. decodeURI decodes %25 to %, which creates unintended
// encoding sequences. Re-encode it, unless it's part of
// a sequence that survived decodeURI, i.e. one for:
// ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '#'
// (RFC 3987 section 3.2)
// 2. Re-encode whitespace so that it doesn't get eaten away
// by the location bar (bug 410726).
.replace(/%(?!3B|2F|3F|3A|40|26|3D|2B|24|2C|23)|[\r\n\t]/ig,
encodeURIComponent);
} catch (e) {}
// Encode bidirectional formatting characters.
// (RFC 3987 sections 3.2 and 4.1 paragraph 6)
value = value.replace(/[\u200e\u200f\u202a\u202b\u202c\u202d\u202e]/g,
encodeURIComponent);
value = losslessDecodeURI(aURI);
state = "valid";
}
}
@ -2004,6 +1983,30 @@ function URLBarSetURI(aURI, aMustUseURI) {
SetPageProxyState(state);
}
function losslessDecodeURI(aURI) {
var value = aURI.spec;
// Try to decode as UTF-8 if there's no encoding sequence that we would break.
if (!/%25(?:3B|2F|3F|3A|40|26|3D|2B|24|2C|23)/i.test(value))
try {
value = decodeURI(value)
// 1. decodeURI decodes %25 to %, which creates unintended
// encoding sequences. Re-encode it, unless it's part of
// a sequence that survived decodeURI, i.e. one for:
// ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '#'
// (RFC 3987 section 3.2)
// 2. Re-encode whitespace so that it doesn't get eaten away
// by the location bar (bug 410726).
.replace(/%(?!3B|2F|3F|3A|40|26|3D|2B|24|2C|23)|[\r\n\t]/ig,
encodeURIComponent);
} catch (e) {}
// Encode bidirectional formatting characters.
// (RFC 3987 sections 3.2 and 4.1 paragraph 6)
value = value.replace(/[\u200e\u200f\u202a\u202b\u202c\u202d\u202e]/g,
encodeURIComponent);
return value;
}
// Replace the urlbar's value with the url of the page.
function handleURLBarRevert() {
var throbberElement = document.getElementById("navigator-throbber");

9
browser/base/content/urlbarBindings.xml
View File

@ -247,16 +247,13 @@
onget="return this.value;">
<setter>
<![CDATA[
// Force load the value into the urlbar to get it unescaped
try {
let uri = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService).
newURI(val, null, null);
URLBarSetURI(uri, true);
} catch (ex) {
// Incase the value isn't actually a URI
this.value = val;
}
val = losslessDecodeURI(uri);
} catch (ex) { }
this.value = val;
// Completing a result should simulate the user typing the result, so
// fire an input event.