Add chart.getMarkerType API

f3873bbc · Evgeny · aac57f45 · f3873bbc · f3873bbc · f3873bbc
Commit f3873bbc authored Jul 08, 2016 by Evgeny
Showing with 34 additions and 24 deletions

c3.js c3.js +12 -7

c3.min.css c3.min.css +2 -2

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

package.json package.json +8 -8

config.js src/config.js +7 -7

marker.js src/marker.js +5 -0

No files found.
--- a/c3.js
+++ b/c3.js
@@ -1271,13 +1271,13 @@
            line_step_type: 'step',
            marker_types: {},
            allMarkersTypes: [
-                'rhombus',   
-                'square',    
-                'triangle',  
-                'cross',     
-                'asterisk',  
-                'circle',    
-                'plus',      
+                'rhombus',
+                'square',
+                'triangle',
+                'cross', 
+                'asterisk',
+                'circle',
+                'plus',
                'serif',     
                'serifRight'
            ],
@@ -3433,6 +3433,11 @@
        return this.internal.setMarker(id, type);
    }

+    c3_chart_fn.getMarkerType = function(id){
+        var $$ = this.internal;
+        return $$.config.marker_types[id];
+    }
+
    c3_chart_internal_fn.getMarker = function(d, i){
        var $$ = this;


--- a/c3.min.css
+++ b/c3.min.css
-.c3 svg{font:10px sans-serif}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;width:auto;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999;color:#000}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}
\ No newline at end of file
+.c3 svg{font:10px sans-serif}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:grey;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;width:auto;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999;color:#000}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}
\ No newline at end of file
--- a/c3.min.js
+++ b/c3.min.js
--- a/package.json
+++ b/package.json
@@ -24,13 +24,13 @@
    "async-buffer": "3.0.0"
  },
  "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-concat": "~0.5.0",
-    "grunt-contrib-cssmin": "^0.10.0",
-    "grunt-contrib-jasmine": "~0.8.0",
-    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.4.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "load-grunt-tasks": "~0.2.0"
+    "grunt": "1.0.1",
+    "grunt-contrib-concat": "1.0.1",
+    "grunt-contrib-cssmin": "1.0.1",
+    "grunt-contrib-jasmine": "1.0.3",
+    "grunt-contrib-jshint": "1.0.0",
+    "grunt-contrib-uglify": "1.0.1",
+    "grunt-contrib-watch": "1.0.0",
+    "load-grunt-tasks": "3.5.0"
  }
 }
--- a/src/config.js
+++ b/src/config.js
@@ -153,13 +153,13 @@ c3_chart_internal_fn.getDefaultConfig = function () {
        line_step_type: 'step',
        marker_types: {},
        allMarkersTypes: [
-            'rhombus',   
-            'square',    
-            'triangle',  
-            'cross',     
-            'asterisk',  
-            'circle',    
-            'plus',      
+            'rhombus',
+            'square',
+            'triangle',
+            'cross', 
+            'asterisk',
+            'circle',
+            'plus',
            'serif',     
            'serifRight'
        ],

--- a/src/marker.js
+++ b/src/marker.js
@@ -140,6 +140,11 @@ c3_chart_fn.setMarker = function(id, type){
    return this.internal.setMarker(id, type);
 }

+c3_chart_fn.getMarkerType = function(id){
+    var $$ = this.internal;
+    return $$.config.marker_types[id];
+}
+
 c3_chart_internal_fn.getMarker = function(d, i){
    var $$ = this;