Actually fix b199819

2003-08-08 00:52:33 +00:00 · 2003-08-08 00:52:33 +00:00 · de6c173bd4
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -549,7 +549,6 @@ const gFormFillPrefListener =
      return;
      
    this.toggleFormFill();
-    this.toggleAutoCompleteInSearchBar();
  },
  
  toggleFormFill: function ()
@ -563,15 +562,15 @@ const gFormFillPrefListener =
      gBrowser.attachFormFill();
    else
      gBrowser.detachFormFill();
-  },
-  
-  toggleAutoCompleteInSearchBar: function()
-  {
+    gBrowser.setAttribute("autocompleteenabled", gFormFillEnabled);
+
    var searchBar = document.getElementById("search-bar");
-    if (gFormFillEnabled)
-      searchBar.removeAttribute("disableautocomplete");
-    else
-      searchBar.setAttribute("disableautocomplete", "true");
+    if (searchBar) {
+      if (gFormFillEnabled)
+        searchBar.removeAttribute("disableautocomplete");
+      else
+        searchBar.setAttribute("disableautocomplete", "true");
+    }
  }
 }
 
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@ -327,6 +327,9 @@
        <body>
          <![CDATA[
            this.removeEventListener("load", this.handleEvent, true);
+            
+            if (this.getAttribute("autocompleteenabled") == "true")
+              this.attachFormFill();
         ]]>
        </body>
      </method>
--- a/toolkit/content/widgets/tabbrowser.xml
+++ b/toolkit/content/widgets/tabbrowser.xml
@ -679,6 +679,7 @@
            b.setAttribute("contextmenu", this.getAttribute("contentcontextmenu"));
            b.setAttribute("tooltip", this.getAttribute("contenttooltip"));
            b.setAttribute("autocompletepopup", this.getAttribute("autocompletepopup"));
+            b.setAttribute("autocompleteenabled", this.getAttribute("autocompleteenabled"));
            
            this.mPanelContainer.appendChild(b);