Version 0.6.202, update xnode.animate().

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 15_ScrollBox.js

diff --git a/0.6.x/js/20_ui/15_ScrollBox.js b/0.6.x/js/20_ui/15_ScrollBox.js
index fd8946b..46bc52d 100644 (file)
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -24,11 +24,13 @@ function XUI_ScrollBox_start( scrollBox ){
                if( scrollBox.xnode !== XUI_ScrollBox_indicatorV.parent ){\r
                        console.log( '*** Scroll Indicator add ***' );\r
                        scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorV );\r
-                       XUI_ScrollBox_indicatorV[ 'animate' ](\r
-                                       { opacity : 0 },\r
-                                       { opacity : 0.5 },\r
-                                       900, 'circular', 300\r
-                               );\r
+                       XUI_ScrollBox_indicatorV[ 'animate' ]({\r
+                                       'from'        : { opacity : 0 },\r
+                                       'to'          : { opacity : 0.5 },\r
+                                       'duration'    : 900,\r
+                                       'easing'      : 'circular',\r
+                                       'lazyRelease' : 300\r
+                               });\r
                        scrollBox\r
                                [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
                };\r
@@ -44,11 +46,13 @@ function XUI_ScrollBox_start( scrollBox ){
                };\r
                if( scrollBox.xnode !== XUI_ScrollBox_indicatorH.parent ){                      \r
                        scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorH );\r
-                       XUI_ScrollBox_indicatorH[ 'animate' ](\r
-                                       { opacity : 0 },\r
-                                       { opacity : 0.5 },\r
-                                       900, 'circular', 300\r
-                               );\r
+                       XUI_ScrollBox_indicatorH[ 'animate' ]({\r
+                                       'from'        : { opacity : 0 },\r
+                                       'to'          : { opacity : 0.5 },\r
+                                       'duration'    : 900,\r
+                                       'easing'      : 'circular',\r
+                                       'lazyRelease' : 300\r
+                               });\r
                        scrollBox\r
                                [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );                       \r
                };\r
@@ -65,11 +69,13 @@ function XUI_ScrollBox_indicatorHandleEvent( e ){
                case X_EVENT_CANCELED :\r
                case XUI_Event.SCROLL_END :\r
                        console.log( '-fadeout-' );\r
-                       this[ 'animate' ](\r
-                               { opacity : 0.5 },\r
-                               { opacity : 0 },\r
-                               900, 'circular', 300\r
-                       );\r
+                       this[ 'animate' ]({\r
+                                       'from'        : { opacity : 0.5 },\r
+                                       'to'          : { opacity : 0 },\r
+                                       'duration'    : 900,\r
+                                       'easing'      : 'circular',\r
+                                       'lazyRelease' : 300\r
+                               });\r
                        break;\r
        };\r
 };\r
@@ -295,17 +301,19 @@ function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release
        opt_easing  = opt_easing === '' ? '' : opt_easing || 'circular';\r
        opt_release = 0 <= opt_release ? opt_release : 300;\r
        \r
-       that.xnodeSlider[ 'animate' ](\r
-               {\r
-                       x : that.scrollX,\r
-                       y : that.scrollY\r
-               },\r
-               {\r
-                       x : x,\r
-                       y : y\r
-               },\r
-               opt_time, opt_easing, opt_release\r
-       );\r
+       that.xnodeSlider[ 'animate' ]({\r
+                                       'from'        : {\r
+                                                       x : that.scrollX,\r
+                                                       y : that.scrollY\r
+                                               },\r
+                                       'to'          : {\r
+                                                       x : x,\r
+                                                       y : y\r
+                                               },\r
+                                       'duration'    : opt_time,\r
+                                       'easing'      : opt_easing,\r
+                                       'lazyRelease' : opt_release\r
+                               });\r
 \r
        if( X_UA[ 'IE' ] < 6 ){\r
                XUI_ScrollBox_indicatorV && XUI_ScrollBox_indicatorV[ 'css' ]( 'left', ( scrollBoxW - that.fontSize * 0.6 | 0 ) + 'px' );\r
@@ -320,16 +328,17 @@ function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release
                        [ 'css' ]({\r
                                height : ( indicatorH | 0 ) + 'px'\r
                        })\r
-                       [ 'animate' ](\r
-                       {\r
-                               y : scrollBoxH * that.scrollY / that.scrollYMax\r
-                       },\r
-                       {\r
-                               y : scrollBoxH * y / that.scrollYMax,\r
-                               opacity : 0.5\r
-                       },\r
-                       opt_time, opt_easing, opt_release\r
-               );\r
+                       [ 'animate' ]({\r
+                                       'from'        : {\r
+                                                       y       : scrollBoxH * that.scrollY / that.scrollYMax },\r
+                                       'to'          : {\r
+                                                       y       : scrollBoxH * y / that.scrollYMax,\r
+                                                       opacity : 0.5\r
+                                               },\r
+                                       'duration'    : opt_time,\r
+                                       'easing'      : opt_easing,\r
+                                       'lazyRelease' : opt_release\r
+                               });\r
        };\r
        if( that.hasHScroll && XUI_ScrollBox_indicatorH && XUI_ScrollBox_indicatorH.parent === that.xnode ){\r
                indicatorW = scrollBoxW * scrollBoxW / ( - that.scrollXMax + scrollBoxW );\r
@@ -338,16 +347,17 @@ function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release
                        [ 'css' ]({\r
                                width : ( indicatorW | 0 ) + 'px'\r
                        })\r
-                       [ 'animate' ](\r
-                       {\r
-                               x : scrollBoxW * that.scrollX / that.scrollXMax\r
-                       },\r
-                       {\r
-                               x : scrollBoxW * x / that.scrollXMax,\r
-                               opacity : 0.5\r
-                       },\r
-                       opt_time, opt_easing, opt_release\r
-               );\r
+                       [ 'animate' ]({\r
+                                       'from'        : {\r
+                                                       x       : scrollBoxW * that.scrollX / that.scrollXMax },\r
+                                       'to'          : {\r
+                                                       x       : scrollBoxW * x / that.scrollXMax,\r
+                                                       opacity : 0.5\r
+                                               },\r
+                                       'duration'    : opt_time,\r
+                                       'easing'      : opt_easing,\r
+                                       'lazyRelease' : opt_release\r
+                               });\r
        };\r
        \r
        that.scrollX   = x;\r