Version 0.6.121, iScroll5 is working on iPhone touch 1G, update X.Audio.

[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 a819447..b1cec96 100644 (file)
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -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
@@ -177,7 +177,7 @@ var m      = Math,
                this.options = new Options();\r
 \r
                // User defined options\r
-               if( options ) for (i in options) this.options[i] = options[i];\r
+               if( options ) for (i in options) X_EMPTY_OBJECT[ k ] || ( this.options[i] = options[i] );\r
                \r
                this.options.hScroll && ( this.hScrollbar = new Scrollbar( 'h', this ) );\r
                this.options.vScroll && ( this.vScrollbar = new Scrollbar( 'v', this ) );\r
@@ -196,7 +196,7 @@ var m      = Math,
                // 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
@@ -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,7 +920,7 @@ X.UI._ScrollBox = X.UI._ChromeBox.inherits(
                scrollManager  : null,\r
                \r
                Constructor : function( layout, args ){\r
-                       this.SuperConstructor( layout, args );\r
+                       this.Super( layout, args );\r
                        this._containerNode = _X_Class_getPrivate( this.containerNode );\r
                },\r
                \r