From bcff3582213e0d0a3895298c48ab1ca9c78ca731 Mon Sep 17 00:00:00 2001 From: Alex Shvets Date: Sun, 14 Apr 2013 08:46:47 +0300 Subject: [PATCH] fix module interface --- README.md | 4 ++-- src/clone.js | 16 ++++++++-------- test/clone.test.js | 4 ++-- test/conf/nodeunit-browser.html | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d14c9ba..a9315d9 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ 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(); // diff --git a/src/clone.js b/src/clone.js index 212be84..d4e04f0 100644 --- 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 index c5df8b0..da42aec 100644 --- 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 index 81b8a81..4d4de55 100644 --- a/test/conf/nodeunit-browser.html +++ b/test/conf/nodeunit-browser.html @@ -6,7 +6,7 @@ - +