Core: cleaned up $.ui.hasScroll().

diff --git a/ui/ui.core.js b/ui/ui.core.js
index 339d707049b01093e5d1fd4d84c2ecf50b0c9925..00167f1e79fc66425d5ec32b012c4cc90ba5c0a2 100644 (file)
--- a/ui/ui.core.js
+++ b/ui/ui.core.js
@@ -53,9 +53,17 @@ $.ui = {
                $(el).attr('unselectable', 'off').css('MozUserSelect', '');
        },
        hasScroll: function(e, a) {
-               var scroll = /top/.test(a||"top") ? 'scrollTop' : 'scrollLeft', has = false;
-               if (e[scroll] > 0) return true; e[scroll] = 1;
-               has = e[scroll] > 0 ? true : false; e[scroll] = 0;
+               var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop',
+                       has = false;
+               
+               if (e[scroll] > 0) { return true; }
+               
+               // TODO: determine which cases actually cause this to happen
+               // if the element doesn't have the scroll set, see if it's possible to
+               // set the scroll
+               e[scroll] = 1;
+               has = (e[scroll] > 0);
+               e[scroll] = 0;
                return has;
        }
 };