put 'captureevents' under common annotation defaults

etpinard · etpinard · commit ef985cfd5f94 · 2017-05-25T16:30:08.000-04:00
diff --git a/src/components/annotations/annotation_defaults.js b/src/components/annotations/annotation_defaults.js
@@ -87,7 +87,5 @@ module.exports = function handleAnnotationDefaults(annIn, annOut, fullLayout, op
         annOut._yclick = (yClick === undefined) ? annOut.y : yClick;
     }
 
-    coerce('captureevents', !!annOut.hovertext);
-
     return annOut;
 };
diff --git a/src/components/annotations/common_defaults.js b/src/components/annotations/common_defaults.js
@@ -61,4 +61,6 @@ module.exports = function handleAnnotationCommonDefaults(annIn, annOut, fullLayo
             color: globalHoverLabel.font.color || hoverBorder
         });
     }
+
+    coerce('captureevents', !!hoverText);
 };
diff --git a/src/components/annotations3d/attributes.js b/src/components/annotations3d/attributes.js
@@ -75,13 +75,13 @@ module.exports = {
     arrowwidth: annAtts.arrowwidth,
     standoff: annAtts.standoff,
     hovertext: annAtts.hovertext,
-    hoverlabel: annAtts.hoverlabel
+    hoverlabel: annAtts.hoverlabel,
+    captureevents: annAtts.captureevents
 
     // maybes later?
     // clicktoshow: annAtts.clicktoshow,
     // xclick: annAtts.xclick,
     // yclick: annAtts.yclick,
-    // captureevent: annAtts.captureevent
 
     // not needed!
     // axref: 'pixel'

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,5 @@ module.exports = function handleAnnotationDefaults(annIn, annOut, fullLayout, op`
`87`	`87`	`annOut._yclick = (yClick === undefined) ? annOut.y : yClick;`
`88`	`88`	`}`
`89`	`89`
`90`		`- coerce('captureevents', !!annOut.hovertext);`
`91`		`-`
`92`	`90`	`return annOut;`
`93`	`91`	`};`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,6 @@ module.exports = function handleAnnotationCommonDefaults(annIn, annOut, fullLayo`
`61`	`61`	`color: globalHoverLabel.font.color \|\| hoverBorder`
`62`	`62`	`});`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+ coerce('captureevents', !!hoverText);`
`64`	`66`	`};`