fix some focus issues

This commit is contained in:
chanial%noos.fr 2002-10-26 16:53:19 +00:00
parent dd3d83d08e
commit 591a979097
2 changed files with 10 additions and 13 deletions

View File

@ -531,29 +531,26 @@ var BookmarksCommand = {
// requires utilityOverlay.js if opening in new window for getTopWin()
openOneBookmark: function (aURI, aTargetBrowser, aDS)
{
var w, browser
var url = BookmarksUtils.getProperty(aURI, NC_NS+"URL", aDS)
// Ignore "NC:" and empty urls.
if (url == "")
return;
var w = aTargetBrowser == "window"? null:getTopWin();
if (!w) {
openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
return;
}
var browser = w.document.getElementById("content");
switch (aTargetBrowser) {
case "current":
openTopWin(url);
browser.loadURI(url);
w._content.focus();
break;
case "tab":
w = getTopWin();
if (!w) {
openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
break;
}
browser = w.document.getElementById("content");
var tab = browser.addTab(url);
browser.selectedTab = tab;
browser.focus();
break;
case "window":
openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
break;
}
},

View File

@ -75,8 +75,8 @@
callback="document.getElementById('bookmarks-view').searchBookmarks(gSearchBox.value);"/>
</hbox>
<bookmarks-tree id="bookmarks-view" type="single-column" flex="1"
onkeypress="if (event.keyCode == 13) {this.loadBookmarkBrowser(event); content.focus()}"
onkeypress="if (event.keyCode == 13) this.loadBookmarkBrowser(event);"
ondraggesture="if (event.originalTarget.localName == 'treechildren') nsDragAndDrop.startDrag(event, this.DNDObserver);"
onclick="this.openItem(event, 1); if (event.button != 2) content.focus()"/>
onclick="this.openItem(event, 1);"/>
</page>