From 48781a7104eb87e3bac61d5670dda63976bda39b Mon Sep 17 00:00:00 2001 From: Henrik Joreteg Date: Thu, 10 Jan 2013 06:59:23 -0800 Subject: [PATCH] Use noConflict by default for CommonJS If you're requiring this as a module you probably don't want the global. Since you'll be assigning the required module to your own variable. --- keymaster.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keymaster.js b/keymaster.js index 0e617e5..29a6cd2 100644 --- a/keymaster.js +++ b/keymaster.js @@ -221,6 +221,9 @@ global.key.getPressedKeyCodes = getPressedKeyCodes; global.key.noConflict = noConflict; - if(typeof module !== 'undefined') module.exports = key; + if(typeof module !== 'undefined') { + module.exports = key; + noConflict(); + } })(this);