Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a method on the fixup object to strip off wyciwyg from nsIURIs

Browse Source 
Fixes bug 164006, wyciwyg: should not appear in tab title
r=jag sr=bzbarsky


git-svn-id: svn://10.0.0.236/trunk@129187 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
caillon%returnzero.com
2002-09-11 01:44:13 +00:00
parent 14f87dddf5
commit 4028442105
9 changed files with 147 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -2344,8 +2344,28 @@ nsDocShell::LoadURI(const PRUnichar * aURI,
nsIInputStream * aHeaderStream)
{
nsCOMPtr<nsIURI> uri;
nsresult rv;
// Create the fixup object if necessary
if (!mURIFixup) {
mURIFixup = do_GetService(NS_URIFIXUP_CONTRACTID);
if (!mURIFixup) {
// No fixup service so try and create a URI and see what happens
nsAutoString uriString(aURI);
// Cleanup the empty spaces that might be on each end.
uriString.Trim(" ");
// Eliminate embedded newlines, which single-line text fields now allow:
uriString.StripChars("\r\n");
NS_ENSURE_TRUE(!uriString.IsEmpty(), NS_ERROR_FAILURE);
nsresult rv = CreateFixupURI(nsDependentString(aURI), getter_AddRefs(uri));
rv = NS_NewURI(getter_AddRefs(uri), uriString);
}
}
if (mURIFixup) {
// Call the fixup object
rv = mURIFixup->CreateFixupURI(nsDependentString(aURI),
nsIURIFixup::FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP,
getter_AddRefs(uri));
}
if (NS_ERROR_UNKNOWN_PROTOCOL == rv ||
NS_ERROR_MALFORMED_URI == rv) {
@@ -4914,32 +4934,6 @@ nsDocShell::InternalLoad(nsIURI * aURI,
return rv;
}
NS_IMETHODIMP
nsDocShell::CreateFixupURI(const nsAString& aStringURI, nsIURI ** aURI)
{
*aURI = nsnull;
nsAutoString uriString(aStringURI);
uriString.Trim(" "); // Cleanup the empty spaces that might be on each end.
// Eliminate embedded newlines, which single-line text fields now allow:
uriString.StripChars("\r\n");
NS_ENSURE_TRUE(uriString.Length() > 0, NS_ERROR_FAILURE);
// Create the fixup object if necessary
if (!mURIFixup) {
mURIFixup = do_GetService(NS_URIFIXUP_CONTRACTID);
if (!mURIFixup) {
// No fixup service so try and create a URI and see what happens
return NS_NewURI(aURI, uriString);
}
}
// Call the fixup object
return mURIFixup->CreateFixupURI(aStringURI,
nsIURIFixup::FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP, aURI);
}
NS_IMETHODIMP
nsDocShell::GetCurrentDocumentOwner(nsISupports ** aOwner)
{