chore(version): bump to v0.4.13

c3js · Jun 11, 2017 · c3553a6 · c3553a6
1 parent 6f3deac
commit c3553a6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/.bmp.yml b/.bmp.yml
@@ -1,5 +1,5 @@
 ---
-version: 0.4.12
+version: 0.4.13
 commit: 'chore(version): bump to v%.%.%'
 files:
   src/core.js: 'version: "%.%.%"'

diff --git a/c3.js b/c3.js
@@ -850,7 +850,7 @@ Axis.prototype.redraw = function redraw(transitions, isHidden) {
     transitions.axisSubX.call($$.subXAxis);
 };
 
-var c3$1 = { version: "0.4.12" };
+var c3$1 = { version: "0.4.13" };
 
 var c3_chart_fn;
 var c3_chart_internal_fn;
@@ -1639,7 +1639,8 @@ c3_chart_internal_fn.initialOpacityForCircle = function (d) {
     return d.value !== null && this.withoutFadeIn[d.id] ? this.opacityForCircle(d) : 0;
 };
 c3_chart_internal_fn.opacityForCircle = function (d) {
-    var opacity = this.config.point_show ? 1 : 0;
+    var isPointShouldBeShown = isFunction(this.config.point_show) ? this.config.point_show(d) : this.config.point_show;
+    var opacity = isPointShouldBeShown ? 1 : 0;
     return isValue(d.value) ? (this.isScatterType(d) ? 0.5 : opacity) : 0;
 };
 c3_chart_internal_fn.opacityForText = function () {
@@ -4656,15 +4657,16 @@ c3_chart_internal_fn.convertUrlToData = function (url, mimeType, headers, keys,
     }
     req.get(function (error, data) {
         var d;
+        var dataResponse = data.response || data.responseText; // Fixes IE9 XHR issue; see #1345
         if (!data) {
             throw new Error(error.responseURL + ' ' + error.status + ' (' + error.statusText + ')');
         }
         if (type === 'json') {
-            d = $$.convertJsonToData(JSON.parse(data.response), keys);
+            d = $$.convertJsonToData(JSON.parse(dataResponse), keys);
         } else if (type === 'tsv') {
-            d = $$.convertTsvToData(data.response);
+            d = $$.convertTsvToData(dataResponse);
         } else {
-            d = $$.convertCsvToData(data.response);
+            d = $$.convertCsvToData(dataResponse);
         }
         done.call($$, d);
     });
@@ -5051,13 +5053,23 @@ c3_chart_internal_fn.mapTargetsToUniqueXs = function (targets) {
     return xs.sort(function (a, b) { return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN; });
 };
 c3_chart_internal_fn.addHiddenTargetIds = function (targetIds) {
-    this.hiddenTargetIds = this.hiddenTargetIds.concat(targetIds);
+    targetIds = (targetIds instanceof Array) ? targetIds : new Array(targetIds);
+    for (var i = 0; i < targetIds.length; i++) {
+        if (this.hiddenTargetIds.indexOf(targetIds[i]) < 0) {
+            this.hiddenTargetIds = this.hiddenTargetIds.concat(targetIds[i]);
+        }
+    }
 };
 c3_chart_internal_fn.removeHiddenTargetIds = function (targetIds) {
     this.hiddenTargetIds = this.hiddenTargetIds.filter(function (id) { return targetIds.indexOf(id) < 0; });
 };
 c3_chart_internal_fn.addHiddenLegendIds = function (targetIds) {
-    this.hiddenLegendIds = this.hiddenLegendIds.concat(targetIds);
+    targetIds = (targetIds instanceof Array) ? targetIds : new Array(targetIds);
+    for (var i = 0; i < targetIds.length; i++) {
+        if (this.hiddenLegendIds.indexOf(targetIds[i]) < 0) {
+            this.hiddenLegendIds = this.hiddenLegendIds.concat(targetIds[i]);
+        }
+    }
 };
 c3_chart_internal_fn.removeHiddenLegendIds = function (targetIds) {
     this.hiddenLegendIds = this.hiddenLegendIds.filter(function (id) { return targetIds.indexOf(id) < 0; });

diff --git a/c3.min.js b/c3.min.js
diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
   "name": "c3",
   "repo": "masayuki0812/c3",
   "description": "A D3-based reusable chart library",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "keywords": [],
   "dependencies": {
     "mbostock/d3": "v3.5.6"

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

diff --git a/src/core.js b/src/core.js
@@ -2,7 +2,7 @@ import Axis from './axis';
 import CLASS from './class';
 import { isValue, isFunction, isString, isUndefined, isDefined, ceil10, asHalfPixel, diffDomain, isEmpty, notEmpty, getOption, hasValue, sanitise, getPathBox } from './util';
 
-export var c3 = { version: "0.4.12" };
+export var c3 = { version: "0.4.13" };
 
 export var c3_chart_fn;
 export var c3_chart_internal_fn;