From 8eb98dc5b1b9f7377c3116df4f6399634557c313 Mon Sep 17 00:00:00 2001 From: jmoenig Date: Fri, 20 Sep 2013 09:50:06 +0200 Subject: fixed #172, IF ON EDGE, BOUNCE Morphic: Rectangle.amountToTranslateWithin() --- morphic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'morphic.js') diff --git a/morphic.js b/morphic.js index aae17fd..2aaba02 100644 --- a/morphic.js +++ b/morphic.js @@ -1035,7 +1035,7 @@ /*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio, FileList, getBlurredShadowSupport*/ -var morphicVersion = '2013-August-06'; +var morphicVersion = '2013-September-20'; var modules = {}; // keep track of additional loaded modules var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug @@ -1928,7 +1928,7 @@ Rectangle.prototype.amountToTranslateWithin = function (aRect) { aRectangle. when all of me cannot be made to fit, prefer to keep my topLeft inside. Taken from Squeak. */ - var dx, dy; + var dx = 0, dy = 0; if (this.right() > aRect.right()) { dx = aRect.right() - this.right(); @@ -1937,7 +1937,7 @@ Rectangle.prototype.amountToTranslateWithin = function (aRect) { dy = aRect.bottom() - this.bottom(); } if ((this.left() + dx) < aRect.left()) { - dx = aRect.left() - this.right(); + dx = aRect.left() - this.left(); } if ((this.top() + dy) < aRect.top()) { dy = aRect.top() - this.top(); -- cgit v1.3.1