build and improved extend function

web3 · Jun 4, 2015 · d14c706 · d14c706
1 parent 733e19e
commit d14c706
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/web3.js b/lib/web3.js
@@ -152,13 +152,13 @@ Object.defineProperty(web3.eth, 'defaultAccount', {
 
 // EXTEND
 web3.extend = function(extension){
-    if(!web3[extension.property])
+    /*jshint maxcomplexity: 6 */
+
+    if(extension.property && !web3[extension.property])
         web3[extension.property] = {};
 
-    if(extension.methods)
-        setupMethods(extension.property ? web3[extension.property] : web3, extension.methods);
-    if(extension.properties)
-        setupProperties(extension.property ? web3[extension.property] : web3, extension.properties);
+    setupMethods(web3[extension.property] || web3, extension.methods || []);
+    setupProperties(web3[extension.property] || web3, extension.properties || []);
 };
 web3.extend.formatters = formatters;
 web3.extend.utils = utils;