rishipandey-github
diff --git a/‎src/plots/cartesian/axes.js
Copy file name to clipboardExpand all lines: src/plots/cartesian/axes.js
+27-24Lines changed: 27 additions & 24 deletions b/‎src/plots/cartesian/axes.js
Copy file name to clipboardExpand all lines: src/plots/cartesian/axes.js
+27-24Lines changed: 27 additions & 24 deletions
diff --git a/‎test/jasmine/tests/tickformatstops_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/tickformatstops_test.js
+3-3Lines changed: 3 additions & 3 deletions b/‎test/jasmine/tests/tickformatstops_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/tickformatstops_test.js
+3-3Lines changed: 3 additions & 3 deletions
@@ -1503,13 +1503,6 @@ axes.getTickFormat = function(ax) {
     function convertToMs(dtick) {
         return typeof dtick !== 'string' ? dtick : Number(dtick.replace('M', '') * ONEAVGMONTH);
     }
-    function isProperStop(dtick, range, convert) {
-        var convertFn = convert || function(x) { return x;};
-        var leftDtick = range[0];
-        var rightDtick = range[1];
-        return ((!leftDtick && typeof leftDtick !== 'number') || convertFn(leftDtick) <= convertFn(dtick)) &&
-               ((!rightDtick && typeof rightDtick !== 'number') || convertFn(rightDtick) >= convertFn(dtick));
-    }
     function getRangeWidth(range, convert) {
         var convertFn = convert || function(x) { return x;};
         var left = range[0] || 0;
@@ -1534,31 +1527,41 @@ axes.getTickFormat = function(ax) {
             return typeof left === 'number' ? 1 : -1;
         }
     }
+    function isProperStop(dtick, range, convert) {
+        var convertFn = convert || function(x) { return x;};
+        var leftDtick = range[0];
+        var rightDtick = range[1];
+        return ((!leftDtick && typeof leftDtick !== 'number') || convertFn(leftDtick) <= convertFn(dtick)) &&
+               ((!rightDtick && typeof rightDtick !== 'number') || convertFn(rightDtick) >= convertFn(dtick));
+    }
+    function isProperLogStop(dtick, range){
+        var isLeftDtickNull = range[0] === null;
+        var isRightDtickNull = range[1] === null;
+        var isDtickInRangeLeft = compareLogTicks(dtick, range[0]) >= 0;
+        var isDtickInRangeRight = compareLogTicks(dtick, range[1]) <= 0;
+        return (isLeftDtickNull || isDtickInRangeLeft) && (isRightDtickNull || isDtickInRangeRight);
+    }
 
     var tickstop;
     if(ax.tickformatstops && ax.tickformatstops.length > 0) {
         switch(ax.type) {
-            case 'date': {
-                tickstop = ax.tickformatstops.find(function(stop) {
-                    return isProperStop(ax.dtick, stop.dtickrange, convertToMs)
-                });
-                break;
-            }
+            case 'date':
             case 'linear': {
-                tickstop = ax.tickformatstops.find(function(stop) {
-                    return isProperStop(ax.dtick, stop.dtickrange, convertToMs)
-                });
+                for(var i = 0; i < ax.tickformatstops.length; i++) {
+                    if (isProperStop(ax.dtick, ax.tickformatstops[i].dtickrange, convertToMs)){
+                        tickstop = ax.tickformatstops[i];
+                        break;
+                    }
+                }
                 break;
             }
             case 'log': {
-                tickstop = ax.tickformatstops.find(function(stop) {
-                    var left = stop.dtickrange[0], right = stop.dtickrange[1];
-                    var isLeftDtickNull = left === null;
-                    var isRightDtickNull = right === null;
-                    var isDtickInRangeLeft = compareLogTicks(ax.dtick, left) >= 0;
-                    var isDtickInRangeRight = compareLogTicks(ax.dtick, right) <= 0;
-                    return (isLeftDtickNull || isDtickInRangeLeft) && (isRightDtickNull || isDtickInRangeRight);
-                });
+                for(var i = 0; i < ax.tickformatstops.length; i++) {
+                    if (isProperLogStop(ax.dtick, ax.tickformatstops[i].dtickrange)) {
+                        tickstop = ax.tickformatstops[i];
+                        break;
+                    }
+                }
                 break;
             }
             default:
 
@@ -50,7 +50,7 @@ describe('Test Axes.getTickformat', function() {
             type: 'linear',
             tickformatstops: lineartickformatstops,
             dtick: 1
-        })).toEqual(lineartickformatstops[1].value);
+        })).toEqual(lineartickformatstops[0].value);
 
         expect(Axes.getTickFormat({
             type: 'linear',
@@ -117,7 +117,7 @@ describe('Test Axes.getTickformat', function() {
             type: 'date',
             tickformatstops: datetickformatstops,
             dtick: 1000
-        })).toEqual(datetickformatstops[1].value); // second
+        })).toEqual(datetickformatstops[0].value); // millisecond
 
         expect(Axes.getTickFormat({
             type: 'date',
@@ -135,7 +135,7 @@ describe('Test Axes.getTickformat', function() {
             type: 'date',
             tickformatstops: datetickformatstops,
             dtick: 'M1'
-        })).toEqual(datetickformatstops[6].value); // month
+        })).toEqual(datetickformatstops[5].value); // week
 
         expect(Axes.getTickFormat({
             type: 'date',