Images: Change width/height to sizex/sizey

plotly · mdtusz · May 12, 2016 · May 6, 2016 · May 6, 2016 · May 6, 2016
commit 47c320c9be87f2a9ff636945baaf77f40ab20a30
diff --git a/src/components/images/attributes.js b/src/components/images/attributes.js
@@ -37,24 +37,24 @@ module.exports = {
        ].join(' ')
    },

-    width: {
+    sizey: {
        valType: 'number',
        role: 'info',
        dflt: 0,
        description: [
-            'Sets the image container width.',
+            'Sets the image container size horizontally.',
            'The image will be sized based on the `position` value.',
            'When `xref` is set to `paper`, units are sized relative',
            'to the plot width.'
        ].join(' ')
    },

-    height: {
+    sizex: {
        valType: 'number',
        role: 'info',
        dflt: 0,
        description: [
-            'Sets the image container height.',
+            'Sets the image container size vertically.',
            'The image will be sized based on the `position` value.',
            'When `yref` is set to `paper`, units are sized relative',
            'to the plot height.'

diff --git a/src/components/images/defaults.js b/src/components/images/defaults.js
@@ -47,8 +47,8 @@ function imageDefaults(imageIn, imageOut, fullLayout) {
    coerce('y');
    coerce('xanchor');
    coerce('yanchor');
-    coerce('width');
-    coerce('height');
+    coerce('sizex');
+    coerce('sizey');
    coerce('sizing');
    coerce('opacity');


diff --git a/src/components/images/draw.js b/src/components/images/draw.js
@@ -61,6 +61,8 @@ module.exports = function draw(gd) {
        var size = fullLayout._size,
            width = xref ? Math.abs(xref.l2p(d.width) - xref.l2p(0)) : d.width * size.w,
            height = yref ? Math.abs(yref.l2p(d.height) - yref.l2p(0)) : d.width * size.h;
+            width = xref ? Math.abs(xref.l2p(d.sizex) - xref.l2p(0)) : d.sizex * size.w,
+            height = yref ? Math.abs(yref.l2p(d.sizey) - yref.l2p(0)) : d.sizey * size.h;

        // Offsets for anchor positioning
        var xOffset = width * anchors.x[d.xanchor].offset + size.l,