X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F15_ScrollBox.js;h=170dfe4643c5f0152b466a9e655d9ccc77f269fd;hb=7973f3ff61f1ef5bd9732f527b175010d0c0971b;hp=47915ff3ea439fbce02c886aa4efb40dc85e0f4a;hpb=86c591d2888cf7b24365c1950646fb1f6190efd1;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/20_ui/15_ScrollBox.js b/0.6.x/js/20_ui/15_ScrollBox.js
index 47915ff..170dfe4 100644
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -40,7 +40,6 @@ var XUI_ScrollBox = XUI_ChromeBox.inherits(
 		directionLocked : '',
 		startTime       : 0,
 		endTime         : 0,
-		isAnimating     : false,
 		isInTransition  : false,
 
 		hasHScroll      : false,
@@ -244,9 +243,10 @@ function X_UI_ScrollBox_onStart( e ){
 	this.startTime       = X_Timer_now();
 
 	// スクロール中の停止
-	if( this.isInTransition || this.isAnimating ){
-		this.isInTransition = this.isAnimating = false;
+	if( this.isInTransition ){
+		this.isInTransition = false;
 		this[ 'dispatch' ]( XUI_Event.SCROLL_END );
+		// TODO current位置
 		this.xnodeSlider.stop();
 	};			
 
@@ -272,7 +272,7 @@ function X_UI_ScrollBox_onMove( e ){
 		absDistX, absDistY;
 	// 規定以上の move でスクロール開始
 
-console.log( 'scrollmove ' + e.buttons + ' ' + e.button );
+//console.log( 'scrollmove ' + e.buttons + ' ' + e.button );
 
 	if( !this.scrollEnabled || e.pointerType !== this.initiated ){
 		return ret;
@@ -463,8 +463,8 @@ function X_UI_ScrollBox_resetPosition( that, time ){
 		return false;
 	};
 
-	//console.log( 'バウンド!' );
-	//console.log( 'rese x:' + x + ' y:' + y );
+	console.log( ' ===> resetPosition - バウンド!' );
+	console.log( '      x:' + x + ' y:' + y );
 	that.scrollTo( x, y, time, that.bounceEasing, 1000 );
 
 	return true;
@@ -509,7 +509,6 @@ function X_UI_ScrollBox_momentum( current, start, time, lowerMargin, wrapperSize
 	};
 };
 
-// TODO Box の継承に！
 X.UI.ScrollBox = X.UI.ChromeBox.inherits(
 	'ScrollBox',
 	X_Class.NONE,
@@ -520,7 +519,7 @@ X.UI.ScrollBox = X.UI.ChromeBox.inherits(
 			if( XUI_ScrollBox.prototype.usableAttrs === XUI_ChromeBox.prototype.usableAttrs ){
 				XUI_ScrollBox.prototype.usableAttrs = supports = XUI_Attr_createAttrDef( XUI_Attr_Support, X_UI_ScrollBox_SUPPORT_ATTRS );
 		
-				XUI_ScrollBox.prototype.attrClass    = XUI_Attr_preset( XUI_Box.prototype.attrClass, supports, { width  : '100%', height : '100%', bgColor : 0x111111 } );
+				XUI_ScrollBox.prototype.attrClass   = XUI_Attr_preset( XUI_Box.prototype.attrClass, supports, { width  : '100%', height : '100%', bgColor : 0x111111 } );
 			};
 			
 			var args = [
@@ -580,4 +579,5 @@ X.UI.ScrollBox = X.UI.ChromeBox.inherits(
 			
 		}
 	}
-);
\ No newline at end of file
+);
+