Update c3.js and c3.min.js

parent 20aed6f7
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
if(isNode()){ if(isNode()){
if(!nodeCss){ if(!nodeCss){
var style = require('fs').readFileSync(__filename.replace('c3.js', 'c3.css'), 'utf-8'); var style = require('fs').readFileSync(__filename.replace('c3.js', 'c3.css'), 'utf-8');
nodeCss = [require('css').parse(style), require('css').parse($$.ed3Config.style)]; nodeCss = [require('css').parse($$.ed3Config.style), require('css').parse(style)];
} }
var obj, rule, sel, decl; var obj, rule, sel, decl;
...@@ -321,6 +321,7 @@ ...@@ -321,6 +321,7 @@
if(!rule.selectors) continue; if(!rule.selectors) continue;
for(var k = 0; k<rule.selectors.length; k++){ for(var k = 0; k<rule.selectors.length; k++){
sel = rule.selectors[k]; sel = rule.selectors[k];
if(sel !== selector) continue;
for(var l = 0; l<rule.declarations.length; l++){ for(var l = 0; l<rule.declarations.length; l++){
decl = rule.declarations[l]; decl = rule.declarations[l];
if(decl.property === property){ if(decl.property === property){
...@@ -356,6 +357,8 @@ ...@@ -356,6 +357,8 @@
} }
} }
c3.getStyleValue = getStyleValue;
c3_chart_internal_fn.init = function () { c3_chart_internal_fn.init = function () {
var $$ = this, config = $$.config; var $$ = this, config = $$.config;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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