fix module interface

oleksandr-shvets · Apr 14, 2013 · bcff358 · bcff358
1 parent 5021c53
commit bcff358
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -39,8 +39,8 @@ Node.js:
 
     //<node.js>
     var clonejs = require('clonejs'),
-        $object = clonejs.prototype;
-    //or: var $object = require('clonejs').prototype;
+        $object = clonejs.$object;
+    //or: var $object = require('clonejs').$object;
     //or: require('clonejs').inject();
     //</node.js>
         

diff --git a/src/clone.js b/src/clone.js
@@ -1246,17 +1246,17 @@ if(typeof module != 'undefined' && module.exports){
 
     if('clonejs' in global){
         var options = global.clonejs;
-    }
 
-    global.clonejs = exports;
-
-    if(options.inject){
-        injectIntoObjectPrototype();
+        if(options.inject){
+            injectIntoObjectPrototype();
+        }
     }
-    
-    if(options.$object !== false){
-        global.$object = global.clonejs.$object;
+
+    if(!options || options.$object !== false){
+        global.$object = exports.$object;
     }
+
+    global.clonejs = exports;
 }
 
 return;

diff --git a/test/clone.test.js b/test/clone.test.js
@@ -1,8 +1,8 @@
 // nodeunit
 
-if(typeof $object==='undefined'){
+if(typeof clonejs === 'undefined'){
     var clonejs = require('../src/clone.js'),
-        $object = clonejs.prototype;
+        $object = clonejs.$object;
 }
 
 this.tests = {

diff --git a/test/conf/nodeunit-browser.html b/test/conf/nodeunit-browser.html
@@ -6,7 +6,7 @@
     <link  href="../../node_modules/nodeunit/share/nodeunit.css" rel="stylesheet" type="text/css" />
     <script src="../../node_modules/nodeunit/examples/browser/nodeunit.js"></script>
 
-    <script src="../../node_modules/nodeunit/dist/browser/nodeunit.js"></script>
+    <!--<script src="../../node_modules/nodeunit/dist/browser/nodeunit.js"></script>-->
 
     <script>var clonejs = {inject: true}</script>
     <script src="../../src/clone.js"></script>