зеркало из https://github.com/mozilla/gecko-dev.git
Bug 101149 - previous window title sticks when accessing xul dir listings
patch by jrgm@netscape.com, r=bbaetz, sr=darin
This commit is contained in:
Родитель
0724c6f553
Коммит
3d50ba2d8a
|
@ -1160,7 +1160,6 @@ function checkForDirectoryListing()
|
||||||
if ( "HTTPIndex" in _content &&
|
if ( "HTTPIndex" in _content &&
|
||||||
_content.HTTPIndex instanceof Components.interfaces.nsIHTTPIndex ) {
|
_content.HTTPIndex instanceof Components.interfaces.nsIHTTPIndex ) {
|
||||||
_content.defaultCharacterset = getMarkupDocumentViewer().defaultCharacterSet;
|
_content.defaultCharacterset = getMarkupDocumentViewer().defaultCharacterSet;
|
||||||
_content.parentWindow = window;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1200,7 +1200,6 @@ function checkForDirectoryListing()
|
||||||
if ( "HTTPIndex" in _content &&
|
if ( "HTTPIndex" in _content &&
|
||||||
_content.HTTPIndex instanceof Components.interfaces.nsIHTTPIndex ) {
|
_content.HTTPIndex instanceof Components.interfaces.nsIHTTPIndex ) {
|
||||||
_content.defaultCharacterset = getMarkupDocumentViewer().defaultCharacterSet;
|
_content.defaultCharacterset = getMarkupDocumentViewer().defaultCharacterSet;
|
||||||
_content.parentWindow = window;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -223,11 +223,7 @@ function Init()
|
||||||
}
|
}
|
||||||
|
|
||||||
// set window title
|
// set window title
|
||||||
var theWindow = window._content.parentWindow;
|
document.title = baseURI;
|
||||||
if (theWindow)
|
|
||||||
{
|
|
||||||
theWindow.title = baseURI;
|
|
||||||
}
|
|
||||||
|
|
||||||
tree.database.AddObserver(RDF_observer);
|
tree.database.AddObserver(RDF_observer);
|
||||||
debug("Directory: added observer\n");
|
debug("Directory: added observer\n");
|
||||||
|
@ -263,9 +259,7 @@ function OnClick(event, node)
|
||||||
window._content.location.href = url;
|
window._content.location.href = url;
|
||||||
|
|
||||||
// set window title
|
// set window title
|
||||||
var theWindow = window._content.parentWindow;
|
document.title = url;
|
||||||
if (theWindow)
|
|
||||||
theWindow.title = url;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче