use xIsDomain, yIsDomain, no more axes.addAxRefDomainCoerceRefExtra

Author: nicholas-esterer

src/components/images/draw.js

@@ -131,18 +131,20 @@ module.exports = function draw(gd) {
         // Axes if specified
         var xa = Axes.getFromId(gd, d.xref);
         var ya = Axes.getFromId(gd, d.yref);
+        var xIsDomain = Axes.getRefType(d.xref) === 'domain';
+        var yIsDomain = Axes.getRefType(d.yref) === 'domain';
 
         var size = fullLayout._size;
         var width, height;
         if(xa !== undefined) {
-            width = ((typeof(d.xref) === 'string') && d.xref.endsWith(' domain')) ?
+            width = ((typeof(d.xref) === 'string') && xIsDomain) ?
                 xa._length * d.sizex :
                 Math.abs(xa.l2p(d.sizex) - xa.l2p(0));
         } else {
             width = d.sizex * size.w;
         }
         if(ya !== undefined) {
-            height = ((typeof(d.yref) === 'string') && d.yref.endsWith(' domain')) ?
+            height = ((typeof(d.yref) === 'string') && yIsDomain) ?
                 ya._length * d.sizey :
                 Math.abs(ya.l2p(d.sizey) - ya.l2p(0));
         } else {
@@ -158,15 +160,15 @@ module.exports = function draw(gd) {
         // Final positions
         var xPos, yPos;
         if(xa !== undefined) {
-            xPos = ((typeof(d.xref) === 'string') && d.xref.endsWith(' domain')) ?
+            xPos = ((typeof(d.xref) === 'string') && xIsDomain) ?
                 xa._length * d.x + xa._offset :
                 xa.r2p(d.x) + xa._offset;
         } else {
             xPos = d.x * size.w + size.l;
         }
         xPos += xOffset;
         if(ya !== undefined) {
-            yPos = ((typeof(d.yref) === 'string') && d.yref.endsWith(' domain')) ?
+            yPos = ((typeof(d.yref) === 'string') && yIsDomain) ?
                 // consistent with "paper" yref value, where positive values
                 // move up the page
                 ya._length * (1 - d.y) + ya._offset :

src/plots/cartesian/axes.js

@@ -84,8 +84,6 @@ function expandRange(range) {
  *     extraOption if there is no axis)
  * extraOption: aside from existing axes with this letter, what non-axis value is allowed?
  *     Only required if it's different from `dflt`
- * domainRef: true if ' domain' should be appended to the axis items in the list
- *     of possible values for this axis reference.
  */
 axes.coerceRef = function(containerIn, containerOut, gd, attr, dflt, extraOption) {
     var axLetter = attr.charAt(attr.length - 1);
@@ -126,30 +124,6 @@ axes.getRefType = function(ar) {
     if(/( domain)$/.test(ar)) { return 'domain'; } else { return 'range'; }
 };
 
-/*
- * Add the specified axis letter and number + " domain" to the extras for
- * coerceRef.
- *
- * container: the object holding the [xyz]ref keys, e.g., a shape.
- * axLetter: the letter of the axis of interest.
- * coerceRefExtras: the current list of extras for coerceRef that will be
- * appended to.
- *
- */
-axes.addAxRefDomainCoerceRefExtra = function(container, axLetter, coerceRefExtras) {
-    var axNumMatch = (
-            container[axLetter + 'ref'] ?
-            container[axLetter + 'ref'].match(/[xyz]([0-9]*)/) :
-            undefined
-        );
-    if(axNumMatch) {
-        var axNum = axNumMatch[1];
-        coerceRefExtras = coerceRefExtras.concat(
-                    (axNum !== undefined) ? [axLetter + axNum + ' domain'] : []);
-    }
-    return coerceRefExtras;
-};
-
 /*
  * coerce position attributes (range-type) that can be either on axes or absolute
  * (paper or pixel) referenced. The biggest complication here is that we don't know