Merge branch 'yongjunj-fix-flatten'

jheer · jheer · commit de18f6dbd469 · 2015-06-30T17:12:16.000-07:00
diff --git a/src/data/flatten.js b/src/data/flatten.js
@@ -5,7 +5,7 @@ vg.data.flatten = function() {
   }
   
   function flat(data, list) {
-    if (data.values) {
+    if (vg.isArray(data.values)) {
       for (var i=0, n=data.values.length; i<n; ++i) {
         flat(data.values[i], list);
       }
diff --git a/vega.js b/vega.js
@@ -3581,7 +3581,7 @@ vg.data.facet = function() {
   }
   
   function flat(data, list) {
-    if (data.values) {
+    if (vg.isArray(data.values)) {
       for (var i=0, n=data.values.length; i<n; ++i) {
         flat(data.values[i], list);
       }
diff --git a/vega.min.js b/vega.min.js

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ vg.data.flatten = function() {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`function flat(data, list) {`
`8`		`- if (data.values) {`
	`8`	`+ if (vg.isArray(data.values)) {`
`9`	`9`	`for (var i=0, n=data.values.length; i<n; ++i) {`
`10`	`10`	`flat(data.values[i], list);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3581,7 +3581,7 @@ vg.data.facet = function() {`
`3581`	`3581`	`}`
`3582`	`3582`
`3583`	`3583`	`function flat(data, list) {`
`3584`		`- if (data.values) {`
	`3584`	`+ if (vg.isArray(data.values)) {`
`3585`	`3585`	`for (var i=0, n=data.values.length; i<n; ++i) {`
`3586`	`3586`	`flat(data.values[i], list);`
`3587`	`3587`	`}`