Version 0.6.114, add AudioSprite, etc.

[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 a52c1d7..b108e48 100644 (file)
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -6,7 +6,7 @@ var m      = Math,
 \r
        function Options(){};\r
        \r
-       X.Class._override( Options.prototype, {\r
+       X_Class_override( Options.prototype, {\r
                hScroll         : true,\r
                vScroll         : true,\r
                x               : 0,\r
@@ -24,9 +24,9 @@ var m      = Math,
                // Scrollbar\r
                hScrollbar      : true,\r
                vScrollbar      : true,\r
-               fixedScrollbar  : X.UA.Android,\r
-               hideScrollbar   : X.UA.iOS,\r
-               fadeScrollbar   : X.UA.iOS, //&& has3d,\r
+               fixedScrollbar  : X_UA.Android,\r
+               hideScrollbar   : X_UA.iOS,\r
+               fadeScrollbar   : X_UA.iOS, //&& has3d,\r
                scrollbarClass  : '',\r
        \r
                // Zoom\r
@@ -51,7 +51,7 @@ var m      = Math,
                        this.transrateXorY = 'translateX(';\r
                };\r
        };\r
-       X.Class._override( Scrollbar.prototype, {\r
+       X_Class_override( Scrollbar.prototype, {\r
                owner          : null,\r
                dir            : null,\r
                options        : null,\r
@@ -70,7 +70,7 @@ var m      = Math,
                        // remove scrollbar\r
                        if( !this.active ){\r
                                if( this.xnodeWrapper ){\r
-                                       X.Dom.Style.transform && this.xnodeIndicator.css( 'transform', '' );\r
+                                       X.CSS.transform && this.xnodeIndicator.css( 'transform', '' );\r
                                        this.xnodeWrapper.css( 'display', 'none' );\r
                                };\r
                                return;\r
@@ -187,32 +187,32 @@ var m      = Math,
                this.y = this.options.y;\r
 \r
                // Normalize options\r
-               this.options.useTransform  = X.Dom.Style.transform && this.options.useTransform;\r
+               this.options.useTransform  = X.CSS.transform && this.options.useTransform;\r
                this.options.hScrollbar    = this.options.hScroll && this.options.hScrollbar;\r
                this.options.vScrollbar    = this.options.vScroll && this.options.vScrollbar;\r
                this.options.zoom          = this.options.useTransform && this.options.zoom;\r
-               this.options.useTransition = X.Dom.Style.transition && this.options.useTransition;\r
+               this.options.useTransition = X.CSS.transition && this.options.useTransition;\r
 \r
                // Helpers FIX ANDROID BUG!\r
                // translate3d and scale doesn't work together!\r
                // Ignoring 3d ONLY WHEN YOU SET this.options.zoom\r
-               //if ( this.options.zoom && X.UA.isAndroid ){\r
+               //if ( this.options.zoom && X_UA.isAndroid ){\r
                //      translateZ = '';\r
                //}\r
                \r
                // Set some default styles\r
 \r
                if (this.options.useTransform){\r
-                       this.scroller.style[X.Dom.Style.transform]       = 'translate(' + this.x + 'px,' + this.y + 'px)' + translateZ;\r
-                       this.scroller.style[X.Dom.Style.transformOrigin] = '0 0';\r
+                       this.scroller.style[X.CSS.transform]       = 'translate(' + this.x + 'px,' + this.y + 'px)' + translateZ;\r
+                       this.scroller.style[X.CSS.transformOrigin] = '0 0';\r
                } else {\r
                        this.scroller.style.cssText += ';position:absolute;top:' + this.y + 'px;left:' + this.x + 'px';\r
                };\r
 \r
                if (this.options.useTransition){\r
-                       this.scroller.style[X.Dom.Style.transition.Property]       = this.options.useTransform ? X.Dom.Style.cssVendor + 'transform' : 'top left';\r
-                       this.scroller.style[X.Dom.Style.transition.Duration]       = '0';                       \r
-                       this.scroller.style[X.Dom.Style.transition.TimingFunction] = 'cubic-bezier(0.33,0.66,0.66,1)';\r
+                       this.scroller.style[X.CSS.transition.Property]       = this.options.useTransform ? X.CSS.cssVendor + 'transform' : 'top left';\r
+                       this.scroller.style[X.CSS.transition.Duration]       = '0';                     \r
+                       this.scroller.style[X.CSS.transition.TimingFunction] = 'cubic-bezier(0.33,0.66,0.66,1)';\r
                        this.options.fixedScrollbar = true;\r
                };\r
 \r
@@ -225,7 +225,7 @@ var m      = Math,
        };\r
 \r
 // Prototype\r
-X.Class._override( iScroll.prototype, {\r
+X_Class_override( iScroll.prototype, {\r
        uinodeRoot     : null,\r
        uinodeTarget   : null,\r
        xnodeTarget    : null,\r
@@ -300,7 +300,7 @@ X.Class._override( iScroll.prototype, {
        },\r
        \r
        _resize: function () {\r
-               X.Timer.once( X.UA.Android ? 200 : 0, this, this.refresh );\r
+               X.Timer.once( X_UA.Android ? 200 : 0, this, this.refresh );\r
                // setTimeout( this.refresh(), isAndroid ? 200 : 0);\r
        },\r
        \r
@@ -920,8 +920,8 @@ X.UI._ScrollBox = X.UI._ChromeBox.inherits(
                scrollManager  : null,\r
                \r
                Constructor : function( layout, args ){\r
-                       this.SuperConstructor( layout, args );\r
-                       this._containerNode = _X.Class._getPrivate( this.containerNode );\r
+                       this.Super( layout, args );\r
+                       this._containerNode = _X_Class_getPrivate( this.containerNode );\r
                },\r
                \r
                creationComplete : function(){\r
@@ -1015,7 +1015,7 @@ X.UI.ScrollBox = X.UI.ChromeBox.inherits(
                        };\r
                        /*\r
                        this.style = DisplayNodeStyle( this,\r
-                               X.Class._newPrivate(\r
+                               X_Class_newPrivate(\r
                                        this,\r
                                        X.UI.Layout.Canvas,\r
                                        [\r