Fixed typo and enhanced the implementation.

qooxdoo · May 7, 2012 · 5c5368d · 5c5368d
1 parent fa52300
commit 5c5368d
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/framework/source/class/qx/bom/Viewport.js b/framework/source/class/qx/bom/Viewport.js
@@ -124,16 +124,18 @@ qx.Bootstrap.define("qx.bom.Viewport",
      * use a one-time environment check to decide which property to use.
      *
      * @param win {Window?window} The window to query
-     * @return {Integer} Scroll position from left edge, always a positive integer
+     * @return {Integer} Scroll position in pixels from left edge, always a positive integer or zero
      */
     getScrollLeft : function(win)
     {
       var win = win ? win : window;
-      var doc = (win||window).document;
-
+
       if (typeof win.pageXOffset !== "undefined") {
-        return win.pageYOffset;
-      } else if (typeof doc.documentElement.scrollLeft !== "undefined") {
+        return win.pageXOffset;
+      }
+
+      var doc = win.document;
+      if (typeof doc.documentElement.scrollLeft !== "undefined") {
         return doc.documentElement.scrollLeft;
       } else {
         return doc.body.scrollLeft;
@@ -150,16 +152,18 @@ qx.Bootstrap.define("qx.bom.Viewport",
      * use a one-time environment check to decide which property to use.
      *
      * @param win {Window?window} The window to query
-     * @return {Integer} Scroll position from top edge, always a positive integer
+     * @return {Integer} Scroll position in pixels from top edge, always a positive integer or zero
      */
     getScrollTop : function(win)
     {
       var win = win ? win : window;
-      var doc = (win||window).document;
 
       if (typeof win.pageYOffeset !== "undefined") {
         return win.pageYOffset;
-      } else if (typeof doc.documentElement.scrollTop !== "undefined") {
+      }
+
+      var doc = win.document;
+      if (typeof doc.documentElement.scrollTop !== "undefined") {
         return doc.documentElement.scrollTop;
       } else {
         return doc.body.scrollTop;