Clean up navigator.js (begone, evil tab, 3-space and 4-space indents, begone, curly brackets following function declarations, and begone, evil strict warnings!), r=caillon, rs=Ben

suite/browser/navigator.js

@@ -243,7 +243,8 @@ nsButtonPrefListener.prototype =
 // Returns true if all the buttons left of the separator in the personal
 // toolbar are hidden, false otherwise.
 // Used by nsButtonPrefListener to hide the separator if needed
-function allLeftButtonsAreHidden() {
+function allLeftButtonsAreHidden()
+{
   var buttonNode = document.getElementById("PersonalToolbar").firstChild;
   while(buttonNode.tagName != "toolbarseparator") {
     if(!buttonNode.hasAttribute("hidden") || buttonNode.getAttribute("hidden") == "false")
@@ -387,7 +388,8 @@ function Startup()
   }
 }
 
-function BrowserFlushBookmarksAndHistory() {
+function BrowserFlushBookmarksAndHistory()
+{
   // Flush bookmakrs and history (used when window closes or is cached).
   try {
     // If bookmarks are dirty, flush 'em to disk
@@ -585,27 +587,26 @@ function OpenBookmarkURL(node, datasources)
 }
 
 function urlDomain(url)
-     {
+{
   urlReg = /http:\/\/([\w.]+)\//;
   return url.match(urlReg)[0];
-	 }
+}
 
 
-function readRDFString(aDS,aRes,aProp) {
+function readRDFString(aDS,aRes,aProp)
+{
   var n = aDS.GetTarget(aRes, aProp, true);
-          if (n)
-            return n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+  return n ? n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : "";
 }
 
 
 function ensureDefaultEnginePrefs(aRDF,aDS) 
-   {
-
+{
   var mPrefs = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPrefBranch);
   var defaultName = mPrefs.getComplexValue("browser.search.defaultenginename" , Components.interfaces.nsIPrefLocalizedString);
-    kNC_Root = aRDF.GetResource("NC:SearchEngineRoot");
-    kNC_child = aRDF.GetResource("http://home.netscape.com/NC-rdf#child");
-    kNC_Name = aRDF.GetResource("http://home.netscape.com/NC-rdf#Name");
+  var kNC_Root = aRDF.GetResource("NC:SearchEngineRoot");
+  var kNC_child = aRDF.GetResource("http://home.netscape.com/NC-rdf#child");
+  var kNC_Name = aRDF.GetResource("http://home.netscape.com/NC-rdf#Name");
           
   var arcs = aDS.GetTargets(kNC_Root, kNC_child, true);
   while (arcs.hasMoreElements()) {
@@ -614,11 +615,10 @@ function ensureDefaultEnginePrefs(aRDF,aDS)
     if (name == defaultName)
       mPrefs.setCharPref("browser.search.defaultengine", engineRes.Value);
   }
-  }
-
-
-function ensureSearchPref() {
+}
 
+function ensureSearchPref()
+{
   var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
   var ds = rdf.GetDataSource("rdf:internetsearch");
   var mPrefs = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPrefBranch);
@@ -629,21 +629,20 @@ function ensureSearchPref() {
     ensureDefaultEnginePrefs(rdf, ds);
     defaultEngine = mPrefs.getCharPref("browser.search.defaultengine");
   }
-   }
+}
 
-
-function getSearchUrl(attr) {
-    var rdf=Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService); 
+function getSearchUrl(attr)
+{
+  var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService); 
   var ds = rdf.GetDataSource("rdf:internetsearch"); 
-    kNC_Root = rdf.GetResource("NC:SearchEngineRoot");
+  var kNC_Root = rdf.GetResource("NC:SearchEngineRoot");
   var mPrefs = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPrefBranch);
   var defaultEngine = mPrefs.getCharPref("browser.search.defaultengine");
-    engineRes= rdf.GetResource(defaultEngine);
-    prop = "http://home.netscape.com/NC-rdf#" + attr;
-    kNC_attr = rdf.GetResource(prop);
-    searchURL = readRDFString(ds, engineRes, kNC_attr);
-    if (searchURL)
-      return searchURL
+  var engineRes = rdf.GetResource(defaultEngine);
+  var prop = "http://home.netscape.com/NC-rdf#" + attr;
+  var kNC_attr = rdf.GetResource(prop);
+  var searchURL = readRDFString(ds, engineRes, kNC_attr);
+  return searchURL;
 }
 
 
@@ -681,7 +680,6 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
 
   if ((!searchStr || searchStr == url)) {
     loadURI(gNavigatorRegionBundle.getString("otherSearchURL"));
-
   } else {
 
     //Check to see if location bar field is a url
@@ -725,7 +723,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
               if (searchURL) {
                 defaultSearchURL = searchURL + escapedSearchStr; 
               } else {
-               var searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr);
+                searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr);
                 if (searchURL)
                   defaultSearchURL = searchURL;
               }
@@ -760,9 +758,8 @@ function BrowserOpenWindow()
 
 function BrowserOpenTab()
 {
-  var handler = Components.classes['@mozilla.org/commandlinehandler/general-startup;1?type=browser'];
-  handler = handler.getService();
-  handler = handler.QueryInterface(Components.interfaces.nsICmdLineHandler);
+  var handler = Components.classes['@mozilla.org/commandlinehandler/general-startup;1?type=browser']
+                          .getService(Components.interfaces.nsICmdLineHandler);
   var startpage = handler.defaultArgs;
   gBrowser.selectedTab = gBrowser.addTab(startpage);
 }
@@ -1485,9 +1482,10 @@ function SetPageProxyState(aState)
 
 function PageProxyDragGesture(aEvent)
 {
-  if (gProxyButton.getAttribute("pageproxystate") == "valid")
+  if (gProxyButton.getAttribute("pageproxystate") == "valid") {
     nsDragAndDrop.startDrag(aEvent, proxyIconDNDObserver);
-  else
+    return true;
+  }
   return false;
 }