chore(version): bump to v0.7.15

c3js · Feb 27, 2020 · 940fce9 · 940fce9
1 parent 49b7975
commit 940fce9
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 16 deletions.
diff --git a/.bmp.yml b/.bmp.yml
@@ -1,5 +1,5 @@
 ---
-version: 0.7.14
+version: 0.7.15
 commit: 'chore(version): bump to v%.%.%'
 files:
   src/core.js: 'version: "%.%.%"'

diff --git a/c3.esm.js b/c3.esm.js
@@ -1,4 +1,4 @@
-/* @license C3.js v0.7.14 | (c) C3 Team and other contributors | http://c3js.org/ */
+/* @license C3.js v0.7.15 | (c) C3 Team and other contributors | http://c3js.org/ */
 import * as d3 from 'd3';
 
 function ChartInternal(api) {
@@ -1069,7 +1069,7 @@ Axis.prototype.redraw = function redraw(duration, isHidden) {
 };
 
 var c3 = {
-    version: "0.7.14",
+    version: "0.7.15",
     chart: {
         fn: Chart.prototype,
         internal: {
@@ -6103,7 +6103,20 @@ ChartInternal.prototype.convertJsonToData = function (json, keys) {
     }
     return data;
 };
+/**
+ * Finds value from the given nested object by the given path.
+ * If it's not found, then this returns undefined.
+ * @param {Object} object the object
+ * @param {string} path the path
+ */
 ChartInternal.prototype.findValueInJson = function (object, path) {
+    if (path in object) {
+        // If object has a key that contains . or [], return the key's value
+        // instead of searching for an inner object.
+        // See https://github.com/c3js/c3/issues/1691 for details.
+        return object[path];
+    }
+
     path = path.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties (replace [] with .)
     path = path.replace(/^\./, '');           // strip a leading dot
     var pathArray = path.split('.');

diff --git a/c3.js b/c3.js
@@ -1,4 +1,4 @@
-/* @license C3.js v0.7.14 | (c) C3 Team and other contributors | http://c3js.org/ */
+/* @license C3.js v0.7.15 | (c) C3 Team and other contributors | http://c3js.org/ */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1278,7 +1278,7 @@
   };
 
   var c3 = {
-    version: "0.7.14",
+    version: "0.7.15",
     chart: {
       fn: Chart.prototype,
       internal: {
@@ -6844,8 +6844,22 @@
 
     return data;
   };
+  /**
+   * Finds value from the given nested object by the given path.
+   * If it's not found, then this returns undefined.
+   * @param {Object} object the object
+   * @param {string} path the path
+   */
+
 
   ChartInternal.prototype.findValueInJson = function (object, path) {
+    if (path in object) {
+      // If object has a key that contains . or [], return the key's value
+      // instead of searching for an inner object.
+      // See https://github.com/c3js/c3/issues/1691 for details.
+      return object[path];
+    }
+
     path = path.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties (replace [] with .)
 
     path = path.replace(/^\./, ''); // strip a leading dot

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.7.14",
+  "version": "0.7.15",
   "keywords": [],
   "dependencies": {
     "mbostock/d3": "v5.0.0"

diff --git a/docs/index.html.haml b/docs/index.html.haml
@@ -38,6 +38,10 @@
 
   %h3 Change Log
   %ul
+    %li
+      <a href="https://github.com/c3js/c3/releases/tag/v0.7.15">v0.7.15</a><span class="gray">&nbsp;-&nbsp;2020-02-28</span>
+      %ul
+        %li Bug fixes.
     %li
       <a href="https://github.com/c3js/c3/releases/tag/v0.7.14">v0.7.14</a><span class="gray">&nbsp;-&nbsp;2020-02-24</span>
       %ul

diff --git a/docs/js/c3.esm.js b/docs/js/c3.esm.js
@@ -1,4 +1,4 @@
-/* @license C3.js v0.7.14 | (c) C3 Team and other contributors | http://c3js.org/ */
+/* @license C3.js v0.7.15 | (c) C3 Team and other contributors | http://c3js.org/ */
 import * as d3 from 'd3';
 
 function ChartInternal(api) {
@@ -1069,7 +1069,7 @@ Axis.prototype.redraw = function redraw(duration, isHidden) {
 };
 
 var c3 = {
-    version: "0.7.14",
+    version: "0.7.15",
     chart: {
         fn: Chart.prototype,
         internal: {
@@ -6103,7 +6103,20 @@ ChartInternal.prototype.convertJsonToData = function (json, keys) {
     }
     return data;
 };
+/**
+ * Finds value from the given nested object by the given path.
+ * If it's not found, then this returns undefined.
+ * @param {Object} object the object
+ * @param {string} path the path
+ */
 ChartInternal.prototype.findValueInJson = function (object, path) {
+    if (path in object) {
+        // If object has a key that contains . or [], return the key's value
+        // instead of searching for an inner object.
+        // See https://github.com/c3js/c3/issues/1691 for details.
+        return object[path];
+    }
+
     path = path.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties (replace [] with .)
     path = path.replace(/^\./, '');           // strip a leading dot
     var pathArray = path.split('.');

diff --git a/docs/js/c3.js b/docs/js/c3.js
@@ -1,4 +1,4 @@
-/* @license C3.js v0.7.14 | (c) C3 Team and other contributors | http://c3js.org/ */
+/* @license C3.js v0.7.15 | (c) C3 Team and other contributors | http://c3js.org/ */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1278,7 +1278,7 @@
   };
 
   var c3 = {
-    version: "0.7.14",
+    version: "0.7.15",
     chart: {
       fn: Chart.prototype,
       internal: {
@@ -6844,8 +6844,22 @@
 
     return data;
   };
+  /**
+   * Finds value from the given nested object by the given path.
+   * If it's not found, then this returns undefined.
+   * @param {Object} object the object
+   * @param {string} path the path
+   */
+
 
   ChartInternal.prototype.findValueInJson = function (object, path) {
+    if (path in object) {
+      // If object has a key that contains . or [], return the key's value
+      // instead of searching for an inner object.
+      // See https://github.com/c3js/c3/issues/1691 for details.
+      return object[path];
+    }
+
     path = path.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties (replace [] with .)
 
     path = path.replace(/^\./, ''); // strip a leading dot

diff --git a/docs/js/c3.min.js b/docs/js/c3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "c3",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "description": "D3-based reusable chart library",
   "main": "c3.js",
   "files": [

diff --git a/src/core.js b/src/core.js
@@ -20,7 +20,7 @@ import {
 } from './util';
 
 var c3 = {
-    version: "0.7.14",
+    version: "0.7.15",
     chart: {
         fn: Chart.prototype,
         internal: {