Bug 609516 - [regression] Urls in the history panel are missing [r=mbrubeck,mfinkle]
authorVivien Nicolas <21@vingtetun.org>
Thu, 04 Nov 2010 19:42:07 +0100
changeset 66960 4189d2e7bdb632a641253bff395d07bc78f8c155
parent 66959 bc8a18af0cebb63192ff7cc1095a7e54386fd878
child 66961 a437c4da3694fc96619b03a386b4d462c758a3c2
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck, mfinkle
bugs609516
Bug 609516 - [regression] Urls in the history panel are missing [r=mbrubeck,mfinkle]
mobile/chrome/content/bindings.xml
mobile/chrome/content/browser-ui.js
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@@ -360,17 +360,17 @@
               item.removeAttribute("badge");
               item.removeAttribute("remote");
               item.removeAttribute("search");
             }
 
             let isBookmark = ((type == "bookmark") || (type == "tag"));
             item.setAttribute("favorite", isBookmark);
             item.setAttribute("src", controller.getImageAt(i));
-            
+
             if (type=="search") {
               item.setAttribute("search", true);
               item.setAttribute("subtitle", searchSubtitle);
             }
 
             item._empty = false;
           }
 
@@ -1283,16 +1283,17 @@
 
             let child = document.createElementNS(XULNS, "autocompleteresult");
             child.setAttribute("value", aItem.title || aItem.uri);
             if (!aItem.uri) {
               child.setAttribute("class", "history-item-title");
             } else {
               child.setAttribute("class", "history-item");
               child.setAttribute("url", aItem.uri);
+              child.setAttribute("subtitle", aItem.uri);
               child.setAttribute("src", aItem.icon);
             }
 
             return child;
           ]]>
         </body>
       </method>
     </implementation>
@@ -1377,16 +1378,17 @@
 
             let child = document.createElementNS(XULNS, "autocompleteresult");
             child.setAttribute("value", aItem.title || aItem.name);
             if (aItem.name) {
               child.setAttribute("class", "remotetabs-item-title");
             } else {
               child.setAttribute("class", "remotetabs-item");
               child.setAttribute("url", aItem.uri);
+              child.setAttribute("subtitle", aItem.uri);
               child.setAttribute("src", aItem.icon);
             }
 
             return child;
           ]]>
         </body>
       </method>
     </implementation>
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -604,16 +604,17 @@ var BrowserUI = {
     let uri = gURIFixup.createFixupURI(aURI, fixupFlags);
     gHistSvc.markPageAsTyped(uri);
   },
 
   showAutoComplete: function showAutoComplete() {
     if (this.isAutoCompleteOpen())
       return;
 
+    this.hidePanel();
     this._hidePopup();
     this.activePanel = AllPagesList;
   },
 
   closeAutoComplete: function closeAutoComplete() {
     if (this.isAutoCompleteOpen())
       this._edit.popup.closePopup();
 
@@ -1012,17 +1013,16 @@ var BrowserUI = {
       }
       case "cmd_stop":
         browser.stop();
         break;
       case "cmd_go":
         this.goToURI();
         break;
       case "cmd_openLocation":
-        this.hidePanel();
         this.showAutoComplete();
         break;
       case "cmd_star":
       {
         let bookmarkURI = browser.currentURI;
         let autoClose = false;
 
         if (PlacesUtils.getMostRecentBookmarkForURI(bookmarkURI) == -1) {