Make setting axis or legend = null as the default way to disabl…

…e them.
vega · Oct 3, 2016 · 7e7ad77 · 7e7ad77
1 parent 902ec5d
commit 7e7ad77
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/examples/specs/bar_grouped.vl.json b/examples/specs/bar_grouped.vl.json
@@ -18,7 +18,7 @@
     "x": {
       "field": "gender", "type": "nominal",
       "scale": {"bandSize": 6},
-      "axis": false
+      "axis": null
     },
     "color": {
       "field": "gender", "type": "nominal",

diff --git a/examples/specs/bar_grouped_horizontal.vl.json b/examples/specs/bar_grouped_horizontal.vl.json
@@ -18,7 +18,7 @@
     "y": {
       "field": "gender", "type": "nominal",
       "scale": {"bandSize": 6},
-      "axis": false
+      "axis": null
     },
     "color": {
       "field": "gender", "type": "nominal",

diff --git a/examples/specs/stacked_area_normalize.vl.json b/examples/specs/stacked_area_normalize.vl.json
@@ -9,7 +9,7 @@
     },
     "y": {
       "aggregate": "sum", "field": "count","type": "quantitative",
-      "axis": false
+      "axis": null
     },
     "color": {"field":"series", "type":"nominal", "scale":{"range": "category20b"}}
   },

diff --git a/examples/specs/stacked_area_stream.vl.json b/examples/specs/stacked_area_stream.vl.json
@@ -9,7 +9,7 @@
     },
     "y": {
       "aggregate": "sum", "field": "count","type": "quantitative",
-      "axis": false
+      "axis": null
     },
     "color": {"field":"series", "type":"nominal", "scale":{"range": "category20b"}}
   },

diff --git a/src/compile/unit.ts b/src/compile/unit.ts
@@ -181,7 +181,9 @@ export class UnitModel extends Model {
           (channel === Y && vlEncoding.has(encoding, Y2))) {
 
         const axisSpec = (encoding[channel] || {}).axis;
-        if (axisSpec !== false) {
+
+        // We no longer support false in the schema, but we keep false here for backward compatability.
+        if (axisSpec !== null && axisSpec !== false) {
           _axis[channel] = extend({},
             config.axis,
             axisSpec === true ? {} : axisSpec ||  {}
@@ -196,7 +198,8 @@ export class UnitModel extends Model {
     return NONSPATIAL_SCALE_CHANNELS.reduce(function(_legend, channel) {
       if (vlEncoding.has(encoding, channel)) {
         const legendSpec = encoding[channel].legend;
-        if (legendSpec !== false) {
+        // We no longer support false in the schema, but we keep false here for backward compatability.
+        if (legendSpec !== null && legendSpec !== false) {
           _legend[channel] = extend({}, config.legend,
             legendSpec === true ? {} : legendSpec ||  {}
           );

diff --git a/src/fielddef.ts b/src/fielddef.ts
@@ -66,7 +66,7 @@ export interface ChannelDefWithScale extends FieldDef {
 }
 
 export interface PositionChannelDef extends ChannelDefWithScale {
-  axis?: boolean | Axis;
+  axis?: Axis;
 }
 export interface ChannelDefWithLegend extends ChannelDefWithScale {
   legend?: Legend;