Version 0.6.196, bug fixes X.XML & X.UI.ScrollBox.

[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 f7d334b..3838363 100644 (file)
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -12,8 +12,10 @@ function XUI_ScrollBox_start( scrollBox ){
        if( scrollBox.hasVScroll ){\r
                if( !XUI_ScrollBox_indicatorV ){\r
                        XUI_ScrollBox_indicatorV = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorV' );\r
-                       \r
                };\r
+               if( XUI_ScrollBox_current )\r
+                       XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+               \r
                scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorV );\r
                XUI_ScrollBox_indicatorV[ 'animate' ](\r
                                { opacity : 0 },\r
@@ -22,11 +24,17 @@ function XUI_ScrollBox_start( scrollBox ){
                        );\r
                scrollBox\r
                        [ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+       } else\r
+       if( XUI_ScrollBox_indicatorV ){\r
+               XUI_ScrollBox_indicatorV[ 'remove' ]();\r
        };\r
+       \r
        if( scrollBox.hasHScroll ){\r
                if( !XUI_ScrollBox_indicatorH ){\r
                        XUI_ScrollBox_indicatorH = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorH' );\r
                };\r
+               if( XUI_ScrollBox_current )\r
+                       XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );\r
                scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorH );\r
                XUI_ScrollBox_indicatorH[ 'animate' ](\r
                                { opacity : 0 },\r
@@ -35,7 +43,11 @@ function XUI_ScrollBox_start( scrollBox ){
                        );\r
                scrollBox\r
                        [ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );\r
+       } else\r
+       if( XUI_ScrollBox_indicatorH ){\r
+               XUI_ScrollBox_indicatorH[ 'remove' ]();\r
        };\r
+       XUI_ScrollBox_current = scrollBox;\r
 };\r
 \r
 function XUI_ScrollBox_indicatorHandleEvent( e ){\r