Merge branch 'olivoil-master'

c3js · May 14, 2014 · 2da7264 · 2da7264
2 parents a8798cd + 6f3389d
commit 2da7264
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/c3.js b/c3.js
@@ -1,6 +1,8 @@
 (function (window) {
     'use strict';
 
+    /*global define, module, exports, require */
+
     var c3 = {
         version: "0.1.38"
     };
@@ -76,7 +78,7 @@
      */
     c3.generate = function (config) {
 
-        var d3 = window.d3 ? window.d3 : window.require ? window.require("d3") : undefined;
+        var d3 = window.d3 ? window.d3 : 'undefined' !== typeof require ? require("d3") : undefined;
 
         var c3 = { data : {}, axis: {}, legend: {} },
             cache = {};
@@ -4539,12 +4541,13 @@
         return typeof v !== 'undefined';
     }
 
-    if (typeof window.define === "function" && window.define.amd) {
-        window.define("c3", ["d3"], c3);
+    if (typeof define === "function" && define.amd) {
+        define("c3", ["d3"], c3);
+    } else if ('undefined' !== typeof exports && 'undefined' !== typeof module) {
+        module.exports = c3;
     } else {
         window.c3 = c3;
     }
-    // TODO: module.exports
 
     // Features:
     // 1. category axis

diff --git a/c3.min.js b/c3.min.js
diff --git a/component.json b/component.json
@@ -2,9 +2,11 @@
   "name": "c3",
   "repo": "masayuki0812/c3",
   "description": "A D3-based reusable chart library",
-  "version": "0.0.1",
+  "version": "0.1.40",
   "keywords": [],
-  "dependencies": {},
+  "dependencies": {
+    "mbostock/d3": "*"
+  },
   "development": {},
   "license": "MIT",
   "main": "c3.js",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "c3",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "description": "D3-based reusable chart library",
   "main": "c3.js",
   "scripts": {