Version 0.6.149, fix X.Audio & 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 be6884f..1fe9486 100644 (file)
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -44,7 +44,7 @@ var X_UI_ScrollBox_SUPPORT_ATTRS = {
 \r
 var XUI_ScrollBox = XUI_ChromeBox.inherits(\r
        '_ScrollBox',\r
-       X_Class.PRIVATE_DATA,\r
+       X_Class.NONE,\r
        {\r
                directionLockThreshold : 10,\r
                scrollXEnabled         : true,\r
@@ -104,9 +104,9 @@ var XUI_ScrollBox = XUI_ChromeBox.inherits(
                _containerNode   : null,\r
                xnodeSlider      : null,\r
                \r
-               Constructor : function( layout, args ){\r
-                       this[ 'Super' ]( layout, args );\r
-                       this._containerNode = X_Class_getPrivate( this.containerNode );\r
+               Constructor : function( user, layout, args ){\r
+                       this[ 'Super' ]( user, layout, args );\r
+                       this._containerNode = X_Pair_get( this.containerNode );\r
                        this.xnodeSlider = this._containerNode.xnode[ 'className' ]( 'ScrollSlider' ).listen( X_EVENT_ANIME_END, this, X_UI_ScrollBox_onAnimeEnd );\r
                        this.xnode[ 'className' ]( 'ScrollBox' );\r
                },\r
@@ -503,26 +503,26 @@ function X_UI_ScrollBox_onAnimeEnd( e ){
        };\r
        if( !X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){\r
                this.isInTransition = false;\r
-               this.dispatch( XUI_Event.SCROLL_END );\r
+               this[ 'dispatch' ]( XUI_Event.SCROLL_END );\r
        };\r
        return X_Callback_NONE;\r
 };\r
 \r
+// TODO Box の継承に！\r
 X.UI.ScrollBox = X.UI.ChromeBox.inherits(\r
        'ScrollBox',\r
        X_Class.NONE,\r
-       XUI_ScrollBox,\r
        {\r
                Constructor : function(){\r
                        var args = [\r
-                                               XUI_Layout_Vertical,                    \r
+                                               XUI_Layout_Canvas,                      \r
                                                {\r
-                                                       name   : 'ScrollBox-Scroller',\r
-                                                       role   : 'container',\r
-                                                       width       : 'auto',\r
-                                                       minWidth    : '100%',\r
-                                                       height      : 'auto',\r
-                                                       minHeight   : '100%'\r
+                                                       name      : 'ScrollBox-Scroller',\r
+                                                       role      : 'container',\r
+                                                       width     : 'auto',\r
+                                                       minWidth  : '100%',\r
+                                                       height    : 'auto',\r
+                                                       minHeight : '100%'\r
                                                }\r
                                        ],\r
                                i    = arguments.length,\r
@@ -541,16 +541,19 @@ X.UI.ScrollBox = X.UI.ChromeBox.inherits(
                                };\r
                        };\r
                        \r
-                       X_Class_newPrivate(\r
+                       X_Pair_create(\r
                                this,\r
-                               XUI_Layout_Canvas,\r
-                               [\r
-                                       {\r
-                                               width  : '100%',\r
-                                               height : '100%'\r
-                                       },\r
-                                       X.UI.VBox.apply( 0, args )\r
-                               ]\r
+                               XUI_ScrollBox(\r
+                                       this,\r
+                                       XUI_Layout_Canvas,\r
+                                       [\r
+                                               {\r
+                                                       width  : '100%',\r
+                                                       height : '100%'\r
+                                               },\r
+                                               X.UI.VBox.apply( 0, args )\r
+                                       ]\r
+                               )\r
                        );\r
                        \r
                        attr && this.attr( attr );\r