rename _scene ref to scene id in annotation container _sceneId

etpinard · etpinard · commit c084da0e2282 · 2017-05-25T16:07:45.000-04:00
diff --git a/src/components/annotations/draw.js b/src/components/annotations/draw.js
@@ -83,12 +83,12 @@ function drawRaw(gd, options, index, xa, ya) {
     var fullLayout = gd._fullLayout;
     var gs = gd._fullLayout._size;
 
-    var className = options._scene ?
-        'annotation-' + options._scene :
+    var className = options._sceneId ?
+        'annotation-' + options._sceneId :
         'annotation';
 
-    var annbase = options._scene ?
-        options._scene + '.annotations[' + index + ']' :
+    var annbase = options._sceneId ?
+        options._sceneId + '.annotations[' + index + ']' :
         'annotations[' + index + ']';
 
     // remove the existing annotation if there is one
@@ -515,7 +515,7 @@ function drawRaw(gd, options, index, xa, ya) {
 
             // the arrow dragger is a small square right at the head, then a line to the tail,
             // all expanded by a stroke width of 6px plus the arrow line width
-            if(gd._context.editable && arrow.node().parentNode && !options._scene) {
+            if(gd._context.editable && arrow.node().parentNode && !options._sceneId) {
                 var arrowDragHeadX = headX;
                 var arrowDragHeadY = headY;
                 if(options.standoff) {
@@ -625,7 +625,7 @@ function drawRaw(gd, options, index, xa, ya) {
 
                         drawArrow(dx, dy);
                     }
-                    else if(!options._scene) {
+                    else if(!options._sceneId) {
                         if(xa) update[annbase + '.x'] = options.x + dx / xa._m;
                         else {
                             var widthFraction = options._xsize / gs.w,
diff --git a/src/components/annotations3d/defaults.js b/src/components/annotations3d/defaults.js
@@ -18,7 +18,7 @@ module.exports = function handleDefaults(sceneLayoutIn, sceneLayoutOut, opts) {
         name: 'annotations',
         handleItemDefaults: handleAnnotationDefaults,
         fullLayout: opts.fullLayout,
-        scene: opts.id
+        sceneId: opts.id
     });
 };
 
@@ -64,7 +64,7 @@ function handleAnnotationDefaults(annIn, annOut, sceneLayout, opts, itemOpts) {
         Lib.noneOrAll(annIn, annOut, ['ax', 'ay']);
     }
 
-    annOut._scene = opts.scene;
+    annOut._sceneId = opts.sceneId;
 
     return annOut;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ module.exports = function handleDefaults(sceneLayoutIn, sceneLayoutOut, opts) {`
`18`	`18`	`name: 'annotations',`
`19`	`19`	`handleItemDefaults: handleAnnotationDefaults,`
`20`	`20`	`fullLayout: opts.fullLayout,`
`21`		`- scene: opts.id`
	`21`	`+ sceneId: opts.id`
`22`	`22`	`});`
`23`	`23`	`};`
`24`	`24`
`@@ -64,7 +64,7 @@ function handleAnnotationDefaults(annIn, annOut, sceneLayout, opts, itemOpts) {`
`64`	`64`	`Lib.noneOrAll(annIn, annOut, ['ax', 'ay']);`
`65`	`65`	`}`
`66`	`66`
`67`		`- annOut._scene = opts.scene;`
	`67`	`+ annOut._sceneId = opts.sceneId;`
`68`	`68`
`69`	`69`	`return annOut;`
`70`	`70`	`}`