X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F15_ScrollBox.js;h=5e49890b668810226afc62a0017fc1482b257081;hb=3d352d8bf476ab57cc333e8d02d0e6ea5efa69b7;hp=170dfe4643c5f0152b466a9e655d9ccc77f269fd;hpb=094b0536bafe5efd70540698cf74ab13ece03ebb;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 170dfe4..5e49890 100644
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -132,13 +132,13 @@ var XUI_ScrollBox = XUI_ChromeBox.inherits(
 function X_UI_ScrollBox_onLayoutBefore( e ){
 	if( e[ 'cancelable' ] && this.isInTransition && X_Node_Anime_translateZ ){
 		this[ 'listenOnce' ]( XUI_Event.SCROLL_END, X_UI_rootData, X_UI_rootData.calculate );
-		return X_Callback_PREVENT_DEFAULT;
+		return X_CALLBACK_PREVENT_DEFAULT;
 	};
 	this.scrollXRatio = this.scrollX ? this.scrollXMax / this.scrollX : 0;
 	this.scrollYRatio = this.scrollY ? this.scrollYMax / this.scrollY : 0;
 	this.xnodeSlider.stop();
 	this.isInTransition = false;
-	return X_Callback_NONE;
+	return X_CALLBACK_NONE;
 };
 
 function X_UI_ScrollBox_onLayoutComplete( e ){
@@ -222,7 +222,7 @@ function X_UI_ScrollBox_onLayoutComplete( e ){
 		};
 
 function X_UI_ScrollBox_onStart( e ){
-	var ret = X_Callback_NONE;
+	var ret = X_CALLBACK_NONE;
 
 	// React to left mouse button only
 	if( e.pointerType === 'mouse' && e.button !== 0 ){
@@ -262,11 +262,11 @@ function X_UI_ScrollBox_onStart( e ){
 	this[ 'listen' ]( XUI_Event._POINTER_MOVE, this, X_UI_ScrollBox_onMove );
 	this[ 'listen' ]( [ XUI_Event._POINTER_UP, XUI_Event._POINTER_CANCEL ], this, X_UI_ScrollBox_onEnd );
 
-	return ret | X_Callback_PREVENT_DEFAULT;
+	return ret | X_CALLBACK_PREVENT_DEFAULT;
 };
 
 function X_UI_ScrollBox_onMove( e ){
-	var ret = X_Callback_NONE,
+	var ret = X_CALLBACK_NONE,
 		deltaX, deltaY, timestamp,
 		newX, newY,
 		absDistX, absDistY;
@@ -363,11 +363,11 @@ function X_UI_ScrollBox_onMove( e ){
 		this.startY = this.scrollY;
 	};
 	// イベントの拘束
-	return ret | X_Callback_PREVENT_DEFAULT | X_Callback_CAPTURE_POINTER;
+	return ret | X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_CAPTURE_POINTER;
 };
 
 function X_UI_ScrollBox_onEnd( e ){
-	var ret    = X_Callback_NONE,
+	var ret    = X_CALLBACK_NONE,
 		time   = 0,
 		easing = '',
 		newX, newY,
@@ -472,13 +472,13 @@ function X_UI_ScrollBox_resetPosition( that, time ){
 
 function X_UI_ScrollBox_onAnimeEnd( e ){
 	if( e.target !== this.xnodeSlider || !this.isInTransition ){
-		return X_Callback_NONE;
+		return X_CALLBACK_NONE;
 	};
 	if( !X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){
 		this.isInTransition = false;
 		this[ 'dispatch' ]( XUI_Event.SCROLL_END );
 	};
-	return X_Callback_NONE;
+	return X_CALLBACK_NONE;
 };
 
 function X_UI_ScrollBox_momentum( current, start, time, lowerMargin, wrapperSize, deceleration ){