Bug 609516 - [regression] Urls in the history panel are missing [r=mbrubeck,mfinkle]

This commit is contained in:
Vivien Nicolas 2010-11-04 19:42:07 +01:00
parent b39061b01a
commit 18e66d7307
2 changed files with 4 additions and 2 deletions

View File

@ -365,7 +365,7 @@
let isBookmark = ((type == "bookmark") || (type == "tag")); let isBookmark = ((type == "bookmark") || (type == "tag"));
item.setAttribute("favorite", isBookmark); item.setAttribute("favorite", isBookmark);
item.setAttribute("src", controller.getImageAt(i)); item.setAttribute("src", controller.getImageAt(i));
if (type=="search") { if (type=="search") {
item.setAttribute("search", true); item.setAttribute("search", true);
item.setAttribute("subtitle", searchSubtitle); item.setAttribute("subtitle", searchSubtitle);
@ -1288,6 +1288,7 @@
} else { } else {
child.setAttribute("class", "history-item"); child.setAttribute("class", "history-item");
child.setAttribute("url", aItem.uri); child.setAttribute("url", aItem.uri);
child.setAttribute("subtitle", aItem.uri);
child.setAttribute("src", aItem.icon); child.setAttribute("src", aItem.icon);
} }
@ -1382,6 +1383,7 @@
} else { } else {
child.setAttribute("class", "remotetabs-item"); child.setAttribute("class", "remotetabs-item");
child.setAttribute("url", aItem.uri); child.setAttribute("url", aItem.uri);
child.setAttribute("subtitle", aItem.uri);
child.setAttribute("src", aItem.icon); child.setAttribute("src", aItem.icon);
} }

View File

@ -609,6 +609,7 @@ var BrowserUI = {
if (this.isAutoCompleteOpen()) if (this.isAutoCompleteOpen())
return; return;
this.hidePanel();
this._hidePopup(); this._hidePopup();
this.activePanel = AllPagesList; this.activePanel = AllPagesList;
}, },
@ -1017,7 +1018,6 @@ var BrowserUI = {
this.goToURI(); this.goToURI();
break; break;
case "cmd_openLocation": case "cmd_openLocation":
this.hidePanel();
this.showAutoComplete(); this.showAutoComplete();
break; break;
case "cmd_star": case "cmd_star":