Version 0.6.199, bug fixes X.Node.Anime & X.Util.Window & X.Net.OAuth2 & X.UI.*.

[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 3838363..9a93207 100644 (file)
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -9,44 +9,54 @@ var XUI_ScrollBox_current,
 \r
 function XUI_ScrollBox_start( scrollBox ){\r
        // 既存スクロールの停止\r
-       if( scrollBox.hasVScroll ){\r
+       if( XUI_ScrollBox_current && XUI_ScrollBox_current !== scrollBox ){\r
+               XUI_ScrollBox_indicatorV &&\r
+               XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+               \r
+               XUI_ScrollBox_indicatorH &&\r
+               XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );\r
+       };\r
+\r
+       if( scrollBox && scrollBox.hasVScroll ){\r
                if( !XUI_ScrollBox_indicatorV ){\r
                        XUI_ScrollBox_indicatorV = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorV' );\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
-                               { opacity : 1 },\r
-                               900, 'circular', 300\r
-                       );\r
-               scrollBox\r
-                       [ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+               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 : 1 },\r
+                                       900, 'circular', 300\r
+                               );\r
+                       scrollBox\r
+                               [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+               };\r
        } else\r
        if( XUI_ScrollBox_indicatorV ){\r
+               console.log( '*** Scroll Indicator remove ***' );\r
                XUI_ScrollBox_indicatorV[ 'remove' ]();\r
        };\r
        \r
-       if( scrollBox.hasHScroll ){\r
+       if( scrollBox && 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
-                               { opacity : 1 },\r
-                               900, 'circular', 300\r
-                       );\r
-               scrollBox\r
-                       [ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );\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 : 1 },\r
+                                       900, 'circular', 300\r
+                               );\r
+                       scrollBox\r
+                               [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );                       \r
+               };\r
        } else\r
        if( XUI_ScrollBox_indicatorH ){\r
                XUI_ScrollBox_indicatorH[ 'remove' ]();\r
        };\r
+       \r
        XUI_ScrollBox_current = scrollBox;\r
 };\r
 \r
@@ -198,6 +208,10 @@ var XUI_ScrollBox = XUI_ChromeBox.inherits(
                                this[ 'unlisten' ]( XUI_Event.SCROLL_END, XUI_rootData, XUI_rootData.calculate );\r
                                \r
                                this.xnodeSlider[ 'stop' ]();\r
+                               \r
+                               XUI_ScrollBox_current === this && XUI_ScrollBox_start( null );\r
+                               \r
+                               this.scrolling = false;\r
                        };\r
                }\r
                \r
@@ -205,7 +219,7 @@ var XUI_ScrollBox = XUI_ChromeBox.inherits(
 );\r
 \r
 function X_UI_ScrollBox_onLayoutBefore( e ){\r
-       if( e[ 'cancelable' ] && this.isInTransition && X_Node_Anime_translateZ ){\r
+       if( e[ 'cancelable' ] && this.isInTransition && X_NodeAnime_translateZ ){\r
                this[ 'listenOnce' ]( XUI_Event.SCROLL_END, XUI_rootData, XUI_rootData.calculate );\r
                return X_CALLBACK_PREVENT_DEFAULT;\r
        };\r
@@ -298,7 +312,7 @@ function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release
                XUI_ScrollBox_indicatorH && XUI_ScrollBox_indicatorH[ 'css' ]( 'top' , ( scrollBoxH - that.fontSize * 0.6 | 0 ) + 'px' );\r
        };\r
 \r
-       if( that.hasVScroll && XUI_ScrollBox_indicatorV ){\r
+       if( that.hasVScroll && XUI_ScrollBox_indicatorV && XUI_ScrollBox_indicatorV.parent === that.xnode ){\r
                indicatorH = scrollBoxH * scrollBoxH / ( - that.scrollYMax + scrollBoxH );\r
                scrollBoxH -= indicatorH;\r
 \r
@@ -317,7 +331,7 @@ function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release
                        opt_time, opt_easing, opt_release\r
                );\r
        };\r
-       if( that.hasHScroll && XUI_ScrollBox_indicatorH ){\r
+       if( that.hasHScroll && XUI_ScrollBox_indicatorH && XUI_ScrollBox_indicatorH.parent === that.xnode ){\r
                indicatorW = scrollBoxW * scrollBoxW / ( - that.scrollXMax + scrollBoxW );\r
                scrollBoxW -= indicatorW;\r
                XUI_ScrollBox_indicatorH\r
@@ -393,7 +407,7 @@ function X_UI_ScrollBox_onMove( e ){
        };\r
 \r
        // gpu の用意\r
-       if( !this.xnodeSlider[ '_anime' ] ){\r
+       if( !this.xnodeSlider[ '_anime' ] || !this.xnodeSlider[ '_anime' ].phase ){\r
                //console.log( 'gpuレイヤーの用意 ' + e.pageY );\r
                //console.log( 'mov1 x:' + this.scrollX + ' y:' + this.scrollY );\r
                X_UI_ScrollBox_translate( this, this.scrollX, this.scrollY, 0, '', 300 );\r