Upgrade to ExtJS 3.1.1 - Released 02/08/2010

[extjs.git] / src / core / Element.scroll-more.js

diff --git a/src/core/Element.scroll-more.js b/src/core/Element.scroll-more.js
index e02c3c0..9c94bdd 100644 (file)
--- a/src/core/Element.scroll-more.js
+++ b/src/core/Element.scroll-more.js
@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.0.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
@@ -16,14 +16,16 @@ Ext.Element.addMethods({
      * @return {Element} this\r
      */\r
     scrollTo : function(side, value, animate){\r
-        var tester = /top/i,\r
-               prop = "scroll" + (tester.test(side) ? "Top" : "Left"),\r
+        var top = /top/i.test(side), //check if we're scrolling top or left\r
                me = this,\r
-               dom = me.dom;\r
+               dom = me.dom,\r
+            prop;\r
         if (!animate || !me.anim) {\r
+            prop = 'scroll' + (top ? 'Top' : 'Left'), // just setting the value, so grab the direction\r
             dom[prop] = value;\r
-        } else {\r
-            me.anim({scroll: {to: tester.test(prop) ? [dom[prop], value] : [value, dom[prop]]}},\r
+        }else{\r
+            prop = 'scroll' + (top ? 'Left' : 'Top'), // if scrolling top, we need to grab scrollLeft, if left, scrollTop\r
+            me.anim({scroll: {to: top ? [dom[prop], value] : [value, dom[prop]]}},\r
                         me.preanim(arguments, 2), 'scroll');\r
         }\r
         return me;\r