keithrob
diff --git a/‎src/plot_api/plot_schema.js
Copy file name to clipboardExpand all lines: src/plot_api/plot_schema.js
+2Lines changed: 2 additions & 0 deletions b/‎src/plot_api/plot_schema.js
Copy file name to clipboardExpand all lines: src/plot_api/plot_schema.js
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/plots/plots.js
Copy file name to clipboardExpand all lines: src/plots/plots.js
+3-2Lines changed: 3 additions & 2 deletions b/‎src/plots/plots.js
Copy file name to clipboardExpand all lines: src/plots/plots.js
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎test/jasmine/tests/calcdata_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/calcdata_test.js
+46Lines changed: 46 additions & 0 deletions b/‎test/jasmine/tests/calcdata_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/calcdata_test.js
+46Lines changed: 46 additions & 0 deletions
@@ -503,6 +503,8 @@ function getTraceAttributes(type) {
 
     var out = {
         meta: _module.meta || {},
+        categories: _module.categories || {},
+        type: type,
         attributes: formatAttributes(attributes),
     };
 
 
@@ -2868,7 +2868,6 @@ function sortAxisCategoriesByValue(axList, gd) {
         // Order by value
         var match = ax.categoryorder.match(sortAxisCategoriesByValueRegex);
         if(match) {
-            console.log(ax._categories);
             // Store values associated with each category
             var categoriesValue = [];
             for(j = 0; j < ax._categories.length; j++) {
@@ -2911,7 +2910,9 @@ function sortAxisCategoriesByValue(axList, gd) {
                     if(twoDim) {
                         for(l = 0; l < value.length; l++) {
                             for(o = 0; o < value[l].length; o++) {
-                                categoriesValue[orientation === 'h' ? o : l][1].push(value[l][o]);
+                                var catIndex = orientation === 'h' ? o : l;
+                                if(catIndex > categoriesValue.length - 1) continue;
+                                categoriesValue[catIndex][1].push(value[l][o]);
                             }
                         }
                     } else {
 
@@ -869,6 +869,52 @@ describe('calculated data and points', function() {
                 'b': 1
             });
         });
+
+        it('should order categories per value per axis', function() {
+            var schema = Plotly.PlotSchema.get();
+            var traces = Object.keys(schema.traces);
+            var tracesSchema = [];
+            var i;
+            for(i = 0; i < traces.length; i++) {
+                tracesSchema.push(schema.traces[traces[i]]);
+            }
+            var cartesianTraces = tracesSchema.filter(function(t) {
+                return t.categories.length && t.categories.indexOf('cartesian') !== -1;
+            });
+
+            var cartesianTraceNames = cartesianTraces.map(function(t) {
+                return t.type;
+            });
+
+            for(i = 0; i < cartesianTraceNames.length; i++) {
+                var type = cartesianTraceNames[i];
+                if(type === 'scattergl') continue;
+                if(type === 'carpet') continue;
+                if(type === 'contourcarpet') continue;
+
+                Plotly.newPlot(gd, {
+                    data: [{
+                        type: type,
+                        x: ['a', 'b', 'c', 'a'],
+                        a: ['a', 'b', 'c', 'a'],
+                        b: [7, 3, 2, 7],
+                        y: [7, 3, 2, 7],
+                        z: [7, 3, 2, 7],
+                        // For OHLC
+                        open: [7, 3, 2, 7],
+                        close: [7, 3, 2, 7],
+                        high: [7, 3, 2, 7],
+                        low: [7, 3, 2, 7]
+                    }],
+                    layout: {
+                        xaxis: {
+                            type: 'category',
+                            categoryorder: 'value ascending'
+                        }
+                    }
+                });
+            }
+        });
     });
 
     describe('customdata', function() {