Indentation in perdomainsettings

1 files changed, 94 insertions, 78 deletions

diff --git a/extensions/perdomainsettings b/extensions/perdomainsettings
index 862cd98b..b8a6ab6c 100644
--- a/extensions/perdomainsettings
+++ b/extensions/perdomainsettings
@@ -127,97 +127,113 @@ var defaultConfig = {
 //>DEFAULT_CONFIG
 };
 
-function apply(o, settings) {
-  var key;
-  var defaults = true;
-  var websettings = o.settings;
-  for (key in settings) {
-    if (!o.set[key]) {
-      websettings[key] = settings[key];
-      o.set[key] = true;
+function apply(o, settings) 
+{
+    var key;
+    var defaults = true;
+    var websettings = o.settings;
+    for (key in settings) 
+    {
+        if (!o.set[key]) 
+        {
+            websettings[key] = settings[key];
+            o.set[key] = true;
+        }
+        else 
+            defaults = false;
     }
-    else {
-      defaults = false;
-    }
-  }
-  return defaults;
+    return defaults;
 }
 
-function onNavigation(wv, frame, request, action) {
-  var length = webviews.length; 
-  var i, host, domain;
-  var found = false;
-  var o = null;
-  for (i=0; i<length && o === null; i++) {
-    if (webviews[i].webview === wv) {
-      o = webviews[i];
+function onNavigation(wv, frame, request, action) 
+{
+    var length = webviews.length; 
+    var i, host, domain;
+    var found = false;
+    var o = null;
+    for (i=0; i<length && o === null; i++) 
+    {
+        if (webviews[i].webview === wv) 
+            o = webviews[i];
     }
-  }
-  if (o === null) {
-    o = { webview : wv, defaults : false, settings : wv.settings };
-    webviews.push(o);
-  }
-  o.set = {};
-  if (frame === wv.mainFrame) {
-    try {
-      var uri = request.uri;
-      host = request.message.uri.host;
-      domain = util.domainFromHost(host);
-      if (domains[domain]) {
-        apply(o, domains[domain]);
-        o.defaults = false;
-      }
-      if (hosts[host]) {
-        apply(o, hosts[host]);
-        o.defaults = false;
-      }
-      if (uris[uri]) {
-        apply(o, uris[uri]);
-        o.defaults = false;
-      }
-      if (o.defaults === false && apply(o, defaults)) {
-        o.defaults = true;
-      }
+    if (o === null) 
+    {
+        o = { webview : wv, defaults : false, settings : wv.settings };
+        webviews.push(o);
     }
-    catch (e) {
-      extensions.error(me, e);
+    o.set = {};
+    if (frame === wv.mainFrame) 
+    {
+        try 
+        {
+            var uri = request.uri;
+            host = request.message.uri.host;
+            domain = util.domainFromHost(host);
+            if (domains[domain]) 
+            {
+                apply(o, domains[domain]);
+                o.defaults = false;
+            }
+            if (hosts[host]) 
+            {
+                apply(o, hosts[host]);
+                o.defaults = false;
+            }
+            if (uris[uri]) 
+            {
+                apply(o, uris[uri]);
+                o.defaults = false;
+            }
+            if (o.defaults === false && apply(o, defaults)) 
+                o.defaults = true;
+        }
+        catch (e) 
+        {
+            extensions.error(me, e);
+        }
     }
-  }
 }
 function onCloseTab(wv) {
-  var i;
-  for (i=0; i<webviews.length; i++) {
-    if (webviews[i].webview === wv) {
-      webviews.splice(i, 1);
-      return;
+    var i;
+    for (i=0; i<webviews.length; i++) 
+    {
+        if (webviews[i].webview === wv) 
+        {
+            webviews.splice(i, 1);
+            return;
+        }
     }
-  }
 }
 
 return {
-  init : function (config) {
-    if (!config) {
-      extensions.error(me, "Missing config");
-      return false;
-    }
-    domains = config.domains || defaultConfig.domains;
-    hosts = config.hosts || defaultConfig.hosts;
-    uris = config.uris || defaultConfig.uris;
-    defaults = config.defaults || defaultConfig.defaults;
-    sigNavigation = signals.connect("navigation", onNavigation);
-    sigCloseTab = signals.connect("closeTab", onCloseTab);
-    return true;
-  },
-  end : function () {
-    if (sigNavigation >= 0) {
-      signals.disconnect(sigNavigation);
-      sigNavigation = -1;
-    }
-    if (sigCloseTab >= 0) {
-      signals.disconnect(sigCloseTab);
-      sigCloseTab = -1;
+    init : function (config) 
+    {
+        if (!config) 
+        {
+            extensions.error(me, "Missing config");
+            return false;
+        }
+        domains = config.domains || defaultConfig.domains;
+        hosts = config.hosts || defaultConfig.hosts;
+        uris = config.uris || defaultConfig.uris;
+        defaults = config.defaults || defaultConfig.defaults;
+        sigNavigation = signals.connect("navigation", onNavigation);
+        sigCloseTab = signals.connect("closeTab", onCloseTab);
+        return true;
+    },
+    end : function () 
+    {
+        if (sigNavigation >= 0) 
+        {
+            signals.disconnect(sigNavigation);
+            sigNavigation = -1;
+        }
+        if (sigCloseTab >= 0) 
+        {
+            signals.disconnect(sigCloseTab);
+            sigCloseTab = -1;
+        }
     }
-  }
 };
 
 // vim: set ft=javascript: