Commit 2da7264a authored by Masayuki Tanaka's avatar Masayuki Tanaka

Merge branch 'olivoil-master'

parents a8798cd6 6f3389db
(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
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -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",
......
{
"name": "c3",
"version": "0.1.38",
"version": "0.1.40",
"description": "D3-based reusable chart library",
"main": "c3.js",
"scripts": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment