From ee40eb8a6e3babd827898dead7f66f83b2b2c263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 23 Mar 2011 12:36:25 +0100
Subject: [PATCH] Bug 637159 - Clean up the fix / workaround for bug 635252.
 r=neil

---
 toolkit/content/widgets/autocomplete.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 97d71af2e9e..583d47891f0 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -110,24 +110,24 @@
       <!-- =================== nsIAutoCompleteInput =================== -->
 
       <field name="popup"><![CDATA[
-        // Wrap in an anonymous function so that the var statements don't
-        // create properties on 'this'.
-        (function (that) {
-          var popup = null;
-          var popupId = that.getAttribute("autocompletepopup");
+        // Wrap in a block so that the let statements don't
+        // create properties on 'this' (bug 635252).
+        {
+          let popup = null;
+          let popupId = this.getAttribute("autocompletepopup");
           if (popupId)
             popup = document.getElementById(popupId);
           if (!popup) {
             popup = document.createElement("panel");
             popup.setAttribute("type", "autocomplete");
             popup.setAttribute("noautofocus", "true");
-  
-            var popupset = document.getAnonymousElementByAttribute(that, "anonid", "popupset");
+
+            let popupset = document.getAnonymousElementByAttribute(this, "anonid", "popupset");
             popupset.appendChild(popup);
           }
-          popup.mInput = that;
-          return popup;
-        })(this);
+          popup.mInput = this;
+          popup;
+        }
       ]]></field>
 
       <property name="controller" onget="return this.mController;" readonly="true"/>