fixed error caused by function in config.data_order

7d882e12 · michalkop93 · b7b5e391 · 7d882e12 · 7d882e12 · 7d882e12
Commit 7d882e12 authored Oct 07, 2014 by michalkop93
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

c3.js c3.js +2 -2

c3.min.js c3.min.js +0 -0

data.js src/data.js +2 -2

No files found.
--- a/c3.js
+++ b/c3.js
@@ -1617,11 +1617,11 @@
    };
    c3_chart_internal_fn.isOrderDesc = function () {
        var config = this.config;
-        return config.data_order && config.data_order.toLowerCase() === 'desc';
+        return typeof(config.data_order) === 'string' && config.data_order.toLowerCase() === 'desc';
    };
    c3_chart_internal_fn.isOrderAsc = function () {
        var config = this.config;
-        return config.data_order && config.data_order.toLowerCase() === 'asc';
+        return typeof(config.data_order) === 'string' && config.data_order.toLowerCase() === 'asc';
    };
    c3_chart_internal_fn.orderTargets = function (targets) {
        var $$ = this, config = $$.config, orderAsc = $$.isOrderAsc(), orderDesc = $$.isOrderDesc();

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/data.js
+++ b/src/data.js
@@ -206,11 +206,11 @@ c3_chart_internal_fn.hasPositiveValueInTargets = function (targets) {
 };
 c3_chart_internal_fn.isOrderDesc = function () {
    var config = this.config;
-    return config.data_order && config.data_order.toLowerCase() === 'desc';
+    return typeof(config.data_order) === 'string' && config.data_order.toLowerCase() === 'desc';
 };
 c3_chart_internal_fn.isOrderAsc = function () {
    var config = this.config;
-    return config.data_order && config.data_order.toLowerCase() === 'asc';
+    return typeof(config.data_order) === 'string' && config.data_order.toLowerCase() === 'asc';
 };
 c3_chart_internal_fn.orderTargets = function (targets) {
    var $$ = this, config = $$.config, orderAsc = $$.isOrderAsc(), orderDesc = $$.isOrderDesc();