Remove the fallback to indexOf search in getCategoryIndex, update the mock object in unit test instead

hy9be · hy9be · commit d2be6c94f329 · 2017-04-10T12:35:08.000-04:00
diff --git a/src/plots/cartesian/set_convert.js b/src/plots/cartesian/set_convert.js
@@ -152,10 +152,8 @@ module.exports = function setConvert(ax, fullLayout) {
         if(ax._categoriesMap) {
             index = ax._categoriesMap[v];
             if(index !== undefined) return index;
-        } else {
-            index = ax._categories.indexOf(v);
-            if(index !== -1) return index;
         }
+
         if(typeof v === 'number') { return v; }
     }
 
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -1685,6 +1685,7 @@ describe('Test axes', function() {
             var ax = {
                 type: 'category',
                 _categories: ['a', 'b', 'c', 'd'],
+                _categoriesMap: {'a': 0, 'b': 1, 'c': 2, 'd': 3},
                 tickmode: 'array',
                 tickvals: ['a', 1, 1.5, 'c', 2.7, 3, 'e', 4, 5, -2],
                 ticktext: ['A!', 'B?', 'B->C'],

Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,8 @@ module.exports = function setConvert(ax, fullLayout) {`
`152`	`152`	`if(ax._categoriesMap) {`
`153`	`153`	`index = ax._categoriesMap[v];`
`154`	`154`	`if(index !== undefined) return index;`
`155`		`- } else {`
`156`		`- index = ax._categories.indexOf(v);`
`157`		`- if(index !== -1) return index;`
`158`	`155`	`}`
	`156`	`+`
`159`	`157`	`if(typeof v === 'number') { return v; }`
`160`	`158`	`}`
`161`	`159`