@@ -1520,8 +1520,8 @@ describe('Test shapes', function() {
1520
1520
function testPathDrag ( dx , dy , layoutShape , node ) {
1521
1521
var xa = Axes . getFromId ( gd , layoutShape . xref ) ;
1522
1522
var ya = Axes . getFromId ( gd , layoutShape . yref ) ;
1523
- var x2p = helpers . getDataToPixel ( gd , xa , layoutShape . xshift ) ;
1524
- var y2p = helpers . getDataToPixel ( gd , ya , layoutShape . yshift , true ) ;
1523
+ var x2p = helpers . getDataToPixel ( gd , xa ) ;
1524
+ var y2p = helpers . getDataToPixel ( gd , ya , undefined , true ) ;
1525
1525
1526
1526
var initialPath = layoutShape . path ;
1527
1527
var initialCoordinates = getPathCoordinates ( initialPath , x2p , y2p ) ;
@@ -1552,8 +1552,14 @@ describe('Test shapes', function() {
1552
1552
function testShapeResize ( direction , dx , dy , layoutShape , node ) {
1553
1553
var xa = Axes . getFromId ( gd , layoutShape . xref ) ;
1554
1554
var ya = Axes . getFromId ( gd , layoutShape . yref ) ;
1555
- var x2p = helpers . getDataToPixel ( gd , xa , layoutShape . xshift ) ;
1556
- var y2p = helpers . getDataToPixel ( gd , ya , layoutShape . yshift , true ) ;
1555
+ var x2p = function ( v , shift ) {
1556
+ var dataToPixel = helpers . getDataToPixel ( gd , xa , shift , false ) ;
1557
+ return dataToPixel ( v ) ;
1558
+ } ;
1559
+ var y2p = function ( v , shift ) {
1560
+ var dataToPixel = helpers . getDataToPixel ( gd , ya , shift , true ) ;
1561
+ return dataToPixel ( v ) ;
1562
+ } ;
1557
1563
1558
1564
var initialCoordinates = getShapeCoordinates ( layoutShape , x2p , y2p ) ;
1559
1565
@@ -1596,8 +1602,14 @@ describe('Test shapes', function() {
1596
1602
1597
1603
var xa = Axes . getFromId ( gd , layoutShape . xref ) ;
1598
1604
var ya = Axes . getFromId ( gd , layoutShape . yref ) ;
1599
- var x2p = helpers . getDataToPixel ( gd , xa , layoutShape . xshift ) ;
1600
- var y2p = helpers . getDataToPixel ( gd , ya , layoutShape . yshift , true ) ;
1605
+ var x2p = function ( v , shift ) {
1606
+ var dataToPixel = helpers . getDataToPixel ( gd , xa , shift ) ;
1607
+ return dataToPixel ( v ) ;
1608
+ } ;
1609
+ var y2p = function ( v , shift ) {
1610
+ var dataToPixel = helpers . getDataToPixel ( gd , ya , shift , true ) ;
1611
+ return dataToPixel ( v ) ;
1612
+ } ;
1601
1613
1602
1614
promise = promise . then ( function ( ) {
1603
1615
var dragHandle = pointToMove === 'start' ?
0 commit comments