Merge branch 'fredriks-master'

josesaribeiro · Aug 17, 2016 · f1e326d · f1e326d
2 parents 2a98eb5 + 36eb41c
commit f1e326d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -18,7 +18,7 @@
     "boss": true,
     "globals": {
         "angular": false,
-        "nv": false,
+        "require": false,
         "d3": false,
         "navigator": false,
         "window": false,

diff --git a/dist/angular-nvd3.js b/dist/angular-nvd3.js
@@ -2,9 +2,17 @@
 * AngularJS-nvD3, v1.0.9-dev; MIT
 * http://krispo.github.io/angular-nvd3
 **************************************************************************/
-(function(){
+(function(window){
 
     'use strict';
+    var nv = window.nv;
+
+    // Node.js or CommonJS
+    if (typeof(exports) !== 'undefined') {
+        /* jshint -W020 */
+        nv = require('nvd3');
+        /* jshint +W020 */
+    }
 
     angular.module('nvd3', [])
 
@@ -642,4 +650,4 @@
                 }
             };
         });
-})();
+})(window);