зеркало из https://github.com/mozilla/gecko-dev.git
Fix for bug 123140. wyciwyg:// appears on urlbar for JS dynamic pages. r=mcafee, sr=alecf a=asa.
This commit is contained in:
Родитель
f62c1a7727
Коммит
8641c9b47a
|
@ -3830,16 +3830,12 @@ nsHTMLDocument::CreateAndAddWyciwygChannel(void)
|
|||
|
||||
|
||||
mDocumentURL->GetSpec(getter_Copies(originalSpec));
|
||||
nsCOMPtr<nsIIOService> ioService(do_GetService("@mozilla.org/network/io-service;1", &rv));
|
||||
if (ioService) {
|
||||
ioService->ExtractUrlPart(originalSpec.get(), nsIIOService::url_Path, 0, 0, getter_Copies(urlPart));
|
||||
}
|
||||
|
||||
// Generate the wyciwyg url
|
||||
url.AssignWithConversion( "wyciwyg://" );
|
||||
url.Assign(NS_LITERAL_STRING( "wyciwyg://" ));
|
||||
url.AppendInt(mWyciwygSessionCnt++, 10);
|
||||
url.AppendWithConversion("/");
|
||||
url.AppendWithConversion(urlPart);
|
||||
url.Append(NS_LITERAL_STRING("/"));
|
||||
url.Append(NS_ConvertUTF8toUCS2(originalSpec));
|
||||
|
||||
nsCOMPtr<nsIURI> wcwgURI;
|
||||
NS_NewURI(getter_AddRefs(wcwgURI), url);
|
||||
|
|
Загрузка…
Ссылка в новой задаче