diff --git a/mozilla/browser/components/preferences/connection.js b/mozilla/browser/components/preferences/connection.js
index 10195ed6b49..abeca76f629 100644
--- a/mozilla/browser/components/preferences/connection.js
+++ b/mozilla/browser/components/preferences/connection.js
@@ -173,5 +173,5 @@ var gConnectionsDialog = {
     if (shareProxiesPref.value)
       this.updateProtocolPrefs();
     return undefined;
-  },
+  }
 };
diff --git a/mozilla/browser/components/preferences/content.js b/mozilla/browser/components/preferences/content.js
index 163b38ec6f8..742bcbca435 100644
--- a/mozilla/browser/components/preferences/content.js
+++ b/mozilla/browser/components/preferences/content.js
@@ -140,10 +140,11 @@ var gContentPane = {
   },
   
   _exceptionsParams: {
-    install: { blockVisible: false, sessionVisible: false, allowVisible: true, prefilledHost: "", permissionType: "install", },
+    install: { blockVisible: false, sessionVisible: false, allowVisible: true, prefilledHost: "", permissionType: "install" },
     popup:   { blockVisible: false, sessionVisible: false, allowVisible: true, prefilledHost: "", permissionType: "popup"   },
-    image:   { blockVisible: true,  sessionVisible: false, allowVisible: true, prefilledHost: "", permissionType: "image"   },
+    image:   { blockVisible: true,  sessionVisible: false, allowVisible: true, prefilledHost: "", permissionType: "image"   }
   },
+  
   showExceptions: function (aPermissionType)
   {
     var bundlePreferences = document.getElementById("bundlePreferences");
diff --git a/mozilla/browser/components/preferences/cookies.js b/mozilla/browser/components/preferences/cookies.js
index aef04612d62..344479bc78f 100644
--- a/mozilla/browser/components/preferences/cookies.js
+++ b/mozilla/browser/components/preferences/cookies.js
@@ -480,6 +480,8 @@ var gCookiesWindow = {
     var ids = ["nameLabel", "name", "valueLabel", "value", "isDomain", "host", 
                "pathLabel", "path", "isSecureLabel", "isSecure", "expiresLabel", 
                "expires"];
+    var properties;
+    
     if (aItem && !aItem.container && seln.count > 0) {
       properties = { name: aItem.name, value: aItem.value, host: aItem.host,
                      path: aItem.path, expires: this.formatExpiresString(aItem.expires),
@@ -515,7 +517,7 @@ var gCookiesWindow = {
     
     var rangeCount = seln.getRangeCount();
     var selectedCookieCount = 0;
-    for (i = 0; i < rangeCount; ++i) {
+    for (var i = 0; i < rangeCount; ++i) {
       var min = {}; var max = {};
       seln.getRangeAt(i, min, max);
       for (var j = min.value; j <= max.value; ++j) {
diff --git a/mozilla/browser/components/preferences/downloads.js b/mozilla/browser/components/preferences/downloads.js
index fa9991b6046..5157fea1d4e 100644
--- a/mozilla/browser/components/preferences/downloads.js
+++ b/mozilla/browser/components/preferences/downloads.js
@@ -177,6 +177,5 @@ var gDownloadsPane = {
     document.documentElement.openWindow("Preferences:DownloadActions",
                                         "chrome://browser/content/preferences/downloadactions.xul",
                                         "", null);
-  },
+  }
 };
-
diff --git a/mozilla/browser/components/preferences/languages.js b/mozilla/browser/components/preferences/languages.js
index 4f58d5c904b..bb77d1a3775 100644
--- a/mozilla/browser/components/preferences/languages.js
+++ b/mozilla/browser/components/preferences/languages.js
@@ -93,13 +93,13 @@ var gLanguagesDialog = {
         var ab = useABCDFormat ? abCDPairs[0] : abCD;
         var cd = useABCDFormat ? abCDPairs[1] : "";
         if (ab) {
-          var language = region = "";
+          var language = "";
           try {
             language = bundleLanguages.getString(ab);
           } 
           catch (e) { continue; };
           
-          
+          var region = "";
           if (useABCDFormat) {
             try {
               region = bundleRegions.getString(cd);
@@ -331,6 +331,6 @@ var gLanguagesDialog = {
       downButton.disabled = true;
       removeButton.disabled = false;
     }
-  },
+  }
 };
 
diff --git a/mozilla/browser/components/preferences/permissionsutils.js b/mozilla/browser/components/preferences/permissionsutils.js
index a65e12ca6b4..bd3bcf44be0 100644
--- a/mozilla/browser/components/preferences/permissionsutils.js
+++ b/mozilla/browser/components/preferences/permissionsutils.js
@@ -95,6 +95,6 @@ var gTreeUtils = {
     aTree.treeBoxObject.ensureRowIsVisible(0);
     
     return ascending;
-  },
+  }
 };
 
diff --git a/mozilla/browser/components/preferences/privacy.js b/mozilla/browser/components/preferences/privacy.js
index 71d44b1d799..4e411de42b6 100644
--- a/mozilla/browser/components/preferences/privacy.js
+++ b/mozilla/browser/components/preferences/privacy.js
@@ -235,6 +235,5 @@ var gPrivacyPane = {
       this.updateMasterPasswordButton();
       document.getElementById("setMasterPassword").focus();
     }
-  },
+  }
 };
-
diff --git a/mozilla/browser/components/preferences/sanitize.js b/mozilla/browser/components/preferences/sanitize.js
index 01dbb660d5f..7fbbb2b419b 100644
--- a/mozilla/browser/components/preferences/sanitize.js
+++ b/mozilla/browser/components/preferences/sanitize.js
@@ -49,6 +49,6 @@ var gSanitizeDialog = {
   {
     this.sanitizePasswords();
     return undefined;
-  },
+  }
 };
 
diff --git a/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.js b/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.js
index 3a22a3f63ca..0d5bf1f002e 100644
--- a/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.js
+++ b/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.js
@@ -501,17 +501,17 @@ function DeleteSelectedItemFromTree
   box.endUpdateBatch();
 
   // update selection and/or buttons
-  var removeButton = document.getElementById(removeButton);
-  var removeAllButton = document.getElementById(removeAllButton);
+  var removeBtn = document.getElementById(removeButton);
+  var removeAllBtn = document.getElementById(removeAllButton);
 
   if (table.length) {
-    removeButton.removeAttribute("disabled");
-    removeAllButton.removeAttribute("disabled");
+    removeBtn.removeAttribute("disabled");
+    removeAllBtn.removeAttribute("disabled");
 
     selection.select(oldSelectStart < table.length ? oldSelectStart : table.length - 1);
   } else {
-    removeButton.setAttribute("disabled", "true");
-    removeAllButton.setAttribute("disabled", "true");
+    removeBtn.setAttribute("disabled", "true");
+    removeAllBtn.setAttribute("disabled", "true");
   }
 }
 
diff --git a/mozilla/toolkit/content/widgets/preferences.xml b/mozilla/toolkit/content/widgets/preferences.xml
index 6b423fb636e..9d2c7898182 100644
--- a/mozilla/toolkit/content/widgets/preferences.xml
+++ b/mozilla/toolkit/content/widgets/preferences.xml
@@ -363,13 +363,15 @@
               dump(e);
             }
           }
+          var value = ("value" in aElement) ? aElement.value : aElement.getAttribute("value");
+
           switch (this.type) {
           case "int":
-            return aElement.value != "" ? parseInt(aElement.value) : 0;
+            return value != "" ? parseInt(value) : 0;
           case "bool":
-            return typeof(aElement.value) == "boolean" ? aElement.value : aElement.value == "true";
+            return typeof(value) == "boolean" ? value : value == "true";
           }
-          return aElement.value;
+          return value;
         ]]>
         </body>
       </method>
diff --git a/mozilla/toolkit/mozapps/downloads/content/DownloadProgressListener.js b/mozilla/toolkit/mozapps/downloads/content/DownloadProgressListener.js
index 719d6a9ea3f..6c8677d6920 100644
--- a/mozilla/toolkit/mozapps/downloads/content/DownloadProgressListener.js
+++ b/mozilla/toolkit/mozapps/downloads/content/DownloadProgressListener.js
@@ -273,6 +273,6 @@ DownloadProgressListener.prototype =
     result = this._replaceInsert(result, 3, secs);
 
     return result;
-  },
+  }
   
 }; 
diff --git a/mozilla/toolkit/mozapps/downloads/content/downloads.js b/mozilla/toolkit/mozapps/downloads/content/downloads.js
index 4383e9bf4c9..772250c11c5 100644
--- a/mozilla/toolkit/mozapps/downloads/content/downloads.js
+++ b/mozilla/toolkit/mozapps/downloads/content/downloads.js
@@ -631,7 +631,7 @@ var gContextMenus = [
 function buildContextMenu(aEvent)
 {
   if (aEvent.target.id != "downloadContextMenu")
-    return;
+    return false;
     
   var popup = document.getElementById("downloadContextMenu");
   while (popup.hasChildNodes())
@@ -782,11 +782,11 @@ function initAutoDownloadDisplay()
     }
 
     var displayName = null;
+    var folder;
     switch (pref.getIntPref("browser.download.folderList")) {
     case 0:
       folder = getDownloadsFolder("Desktop");
-      var strings = document.getElementById("downloadStrings");
-      displayName = strings.getString("displayNameDesktop");
+      displayName = document.getElementById("downloadStrings").getString("displayNameDesktop");
       break;
     case 1:
       folder = getDownloadsFolder("Downloads");
@@ -881,7 +881,7 @@ function getLocalFileFromNativePathOrUrl(aPathOrUrl)
   } else {
 
     // if it's a pathname, create the nsILocalFile directly
-    f = Components.classes["@mozilla.org/file/local;1"].
+    var f = Components.classes["@mozilla.org/file/local;1"].
       createInstance(Components.interfaces.nsILocalFile);
     f.initWithPath(aPathOrUrl);
 
diff --git a/mozilla/toolkit/mozapps/preferences/fontbuilder.js b/mozilla/toolkit/mozapps/preferences/fontbuilder.js
index aa5e4a3ed93..d6978463587 100644
--- a/mozilla/toolkit/mozapps/preferences/fontbuilder.js
+++ b/mozilla/toolkit/mozapps/preferences/fontbuilder.js
@@ -115,5 +115,5 @@ var FontBuilder = {
       }
     }
     aMenuList.appendChild(popup);    
-  },
+  }
 };
diff --git a/mozilla/toolkit/mozapps/preferences/ocsp.js b/mozilla/toolkit/mozapps/preferences/ocsp.js
index a974ada89a1..0389306e018 100644
--- a/mozilla/toolkit/mozapps/preferences/ocsp.js
+++ b/mozilla/toolkit/mozapps/preferences/ocsp.js
@@ -90,6 +90,5 @@ var gOCSPDialog = {
         break;
       }
     }
-  },
+  }
 };
-