Merge pull request #84 from queryselector/issue-24

Fixed #24 for horizontal scrolling

1 files changed, 6 insertions, 9 deletions

diff --git a/morphic.js b/morphic.js
index 436edea..6088c8c 100644
--- a/morphic.js
+++ b/morphic.js
@@ -8681,12 +8681,12 @@ ScrollFrameMorph.prototype.scrollX = function (steps) {
         newX;
 
     newX = cl + steps;
-    if (newX > l) {
-        newX = l;
-    }
     if (newX + cw < r) {
         newX = r - cw;
     }
+    if (newX > l) {
+        newX = l;
+    }
     if (newX !== cl) {
         this.contents.setLeft(newX);
     }
@@ -8700,14 +8700,11 @@ ScrollFrameMorph.prototype.scrollY = function (steps) {
         newY;
 
     newY = ct + steps;
-    if (newY > t) {
-        newY = t;
-    }
     if (newY + ch < b) {
         newY = b - ch;
-        if (newY > t) {
-            newY = t;
-        }
+    }
+    if (newY > t) {
+        newY = t;
     }
     if (newY !== ct) {
         this.contents.setTop(newY);