plotly#189 adding a path for when categorymode is not in ['array', 'c…

…ategory ascending', 'category descending']
monfera · Apr 8, 2016 · f4214cb · f4214cb
1 parent 5f33a7b
commit f4214cb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/plots/cartesian/ordered_categories.js b/src/plots/cartesian/ordered_categories.js
@@ -24,10 +24,15 @@ module.exports = function orderedCategories(axisLetter, categorymode, categoryli
 
         // ... or take the union of all encountered tick keys and sort them as specified
         // (could be simplified with lodash-fp or ramda)
-        [].concat.apply([], data.map(function(d) {return d[axisLetter];}))
-            .filter(function(element, index, array) {return index === array.indexOf(element);})
-            .sort(({
-                'category ascending': d3.ascending,
-                'category descending': d3.descending
-            })[categorymode]);
+
+        ['category ascending', 'category descending'].indexOf(categorymode) > -1 ?
+
+            [].concat.apply([], data.map(function(d) {return d[axisLetter];}))
+                .filter(function(element, index, array) {return index === array.indexOf(element);})
+                .sort(({
+                    'category ascending': d3.ascending,
+                    'category descending': d3.descending
+                })[categorymode]) :
+
+            [].slice();
 };
diff --git a/test/jasmine/tests/calcdata_test.js b/test/jasmine/tests/calcdata_test.js
@@ -172,7 +172,7 @@ describe('calculated data and points', function() {
             });
         });
 
-        fdescribe('explicit category ordering', function() {
+        describe('explicit category ordering', function() {
 
             it('should output categories in explicitly supplied order, independent of trace order', function() {
 
@@ -252,7 +252,7 @@ describe('calculated data and points', function() {
                 expect(gd.calcdata[0][4]).toEqual(jasmine.objectContaining({x: 3, y: 14}));
             });
 
-            fit('should output categories in explicitly supplied order first, if not all categories are covered', function() {
+            it('should output categories in explicitly supplied order first, if not all categories are covered', function() {
 
                 Plotly.plot(gd, [{x: ['c','a','e','b','d'], y: [15,11,12,13,14]}], { xaxis: {
                     type: 'category',