bugfix

Author: Carlos Scheidegger

src/shade/scale/ordinal.js

@@ -10,12 +10,12 @@ Shade.Scale.ordinal = function(opts)
     if (!(opts.range.length >= 2)) { 
         throw "Shade.Scale.ordinal requires arrays of length at least 2";
     }
-    opts.range = _.map(opts.range, Shade.make);
-    var range_types = _.map(opts.range,  function(v) { return v.type; });
+    var range = _.map(opts.range, Shade.make);
+    var range_types = _.map(range,  function(v) { return v.type; });
     if (!all_same(range_types))
         throw "Shade.Scale.linear requires range elements to have the same type";
 
-    var choose = Shade.Utils.choose(range_types);
+    var choose = Shade.Utils.choose(range);
 
     return function(v) {
         return choose(v.as_float().add(0.5));

tests/tests.js

@@ -872,6 +872,15 @@ test("Shade.evaluate()", function() {
     equal(Shade(v1).sin().cos().evaluate(), Math.cos(Math.sin(6)));
 });
 
+test("Shade.scale.*", function() {
+    var t1 = Shade.Scale.ordinal({ 
+        range: [Shade.color("green"),
+                Shade.color("red"),
+                Shade.color("blue"),
+                Shade.color("black"),
+                Shade.color("yellow")]});
+});
+
 module("Facet tests");
 test("Facet.attribute_buffer", function() {
     ok(Facet.attribute_buffer({ vertex_array: [1,2,3,4], item_size: 1}));