Nirajkashyap
diff --git a/‎src/components/annotations/calc_autorange.js
Copy file name to clipboardExpand all lines: src/components/annotations/calc_autorange.js
+11-11Lines changed: 11 additions & 11 deletions b/‎src/components/annotations/calc_autorange.js
Copy file name to clipboardExpand all lines: src/components/annotations/calc_autorange.js
+11-11Lines changed: 11 additions & 11 deletions
diff --git a/‎src/components/modebar/buttons.js
Copy file name to clipboardExpand all lines: src/components/modebar/buttons.js
+15-15Lines changed: 15 additions & 15 deletions b/‎src/components/modebar/buttons.js
Copy file name to clipboardExpand all lines: src/components/modebar/buttons.js
+15-15Lines changed: 15 additions & 15 deletions
diff --git a/‎src/components/modebar/manage.js
Copy file name to clipboardExpand all lines: src/components/modebar/manage.js
+4-6Lines changed: 4 additions & 6 deletions b/‎src/components/modebar/manage.js
Copy file name to clipboardExpand all lines: src/components/modebar/manage.js
+4-6Lines changed: 4 additions & 6 deletions
@@ -23,19 +23,19 @@ module.exports = function calcAutorange(gd) {
 
     var annotationAxes = {};
     annotationList.forEach(function(ann) {
-        annotationAxes[ann.xref] = true;
-        annotationAxes[ann.yref] = true;
+        annotationAxes[ann.xref] = 1;
+        annotationAxes[ann.yref] = 1;
     });
 
-    var autorangedAnnos = Axes.list(gd).filter(function(ax) {
-        return ax.autorange && annotationAxes[ax._id];
-    });
-    if(!autorangedAnnos.length) return;
-
-    return Lib.syncOrAsync([
-        draw,
-        annAutorange
-    ], gd);
+    for(var axId in annotationAxes) {
+        var ax = Axes.getFromId(gd, axId);
+        if(ax.autorange) {
+            return Lib.syncOrAsync([
+                draw,
+                annAutorange
+            ], gd);
+        }
+    }
 };
 
 function annAutorange(gd) {
 
@@ -11,7 +11,7 @@
 
 var Plotly = require('../../plotly');
 var Plots = require('../../plots/plots');
-var Axes = require('../../plots/cartesian/axes');
+var axisIds = require('../../plots/cartesian/axis_ids');
 var Lib = require('../../lib');
 var downloadImage = require('../../snapshot/download');
 var Icons = require('../../../build/ploticon');
@@ -175,15 +175,15 @@ modeBarButtons.hoverCompareCartesian = {
 };
 
 function handleCartesian(gd, ev) {
-    var button = ev.currentTarget,
-        astr = button.getAttribute('data-attr'),
-        val = button.getAttribute('data-val') || true,
-        fullLayout = gd._fullLayout,
-        aobj = {},
-        axList = Axes.list(gd, null, true),
-        ax,
-        allEnabled = 'on',
-        i;
+    var button = ev.currentTarget;
+    var astr = button.getAttribute('data-attr');
+    var val = button.getAttribute('data-val') || true;
+    var fullLayout = gd._fullLayout;
+    var aobj = {};
+    var axList = axisIds.list(gd, null, true);
+    var allEnabled = 'on';
+
+    var ax, i;
 
     if(astr === 'zoom') {
         var mag = (val === 'in') ? 0.5 : 2,
@@ -562,11 +562,11 @@ modeBarButtons.toggleSpikelines = {
 };
 
 function setSpikelineVisibility(gd) {
-    var fullLayout = gd._fullLayout,
-        axList = Axes.list(gd, null, true),
-        ax,
-        axName,
-        aobj = {};
+    var fullLayout = gd._fullLayout;
+    var axList = axisIds.list(gd, null, true);
+    var aobj = {};
+
+    var ax, axName;
 
     for(var i = 0; i < axList.length; i++) {
         ax = axList[i];
 
@@ -9,7 +9,7 @@
 
 'use strict';
 
-var Axes = require('../../plots/cartesian/axes');
+var axisIds = require('../../plots/cartesian/axis_ids');
 var scatterSubTypes = require('../../traces/scatter/subtypes');
 var Registry = require('../../registry');
 
@@ -150,17 +150,15 @@ function getButtonGroups(gd, buttonsToRemove, buttonsToAdd) {
 }
 
 function areAllAxesFixed(fullLayout) {
-    var axList = Axes.list({_fullLayout: fullLayout}, null, true);
-    var allFixed = true;
+    var axList = axisIds.list({_fullLayout: fullLayout}, null, true);
 
     for(var i = 0; i < axList.length; i++) {
         if(!axList[i].fixedrange) {
-            allFixed = false;
-            break;
+            return false;
         }
     }
 
-    return allFixed;
+    return true;
 }
 
 // look for traces that support selection
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`'use strict';`
`11`	`11`
`12`		`-var Axes = require('../../plots/cartesian/axes');`
	`12`	`+var axisIds = require('../../plots/cartesian/axis_ids');`
`13`	`13`	`var scatterSubTypes = require('../../traces/scatter/subtypes');`
`14`	`14`	`var Registry = require('../../registry');`
`15`	`15`
`@@ -150,17 +150,15 @@ function getButtonGroups(gd, buttonsToRemove, buttonsToAdd) {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`function areAllAxesFixed(fullLayout) {`
`153`		`- var axList = Axes.list({_fullLayout: fullLayout}, null, true);`
`154`		`- var allFixed = true;`
	`153`	`+ var axList = axisIds.list({_fullLayout: fullLayout}, null, true);`
`155`	`154`
`156`	`155`	`for(var i = 0; i < axList.length; i++) {`
`157`	`156`	`if(!axList[i].fixedrange) {`
`158`		`- allFixed = false;`
`159`		`- break;`
	`157`	`+ return false;`
`160`	`158`	`}`
`161`	`159`	`}`
`162`	`160`
`163`		`- return allFixed;`
	`161`	`+ return true;`
`164`	`162`	`}`
`165`	`163`
`166`	`164`	`// look for traces that support selection`