+/*\r
+ * scroll 要素は常にひとつ\r
+ * ScrollManager\r
+ * indicatorX, Y は再利用\r
+ */\r
+var XUI_ScrollBox_useCSSP = !X_UA[ 'IE5' ],\r
+ XUI_ScrollBox_current,\r
+ XUI_ScrollBox_indicatorV,\r
+ XUI_ScrollBox_indicatorH;\r
+\r
+function XUI_ScrollBox_start( scrollBox ){\r
+ // 既存スクロールの停止\r
+ if( XUI_ScrollBox_current && XUI_ScrollBox_current !== scrollBox ){\r
+ XUI_ScrollBox_indicatorV &&\r
+ XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+ \r
+ XUI_ScrollBox_indicatorH &&\r
+ XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );\r
+ };\r
\r
-\r
-function X_UI_ScrollBox_momentum( current, start, time, lowerMargin, wrapperSize, deceleration ){\r
- var distance = current - start,\r
- speed = Math.abs( distance ) / time,\r
- destination,\r
- duration;\r
-\r
- deceleration = deceleration === undefined ? 0.0006 : deceleration;\r
-\r
- destination = current + ( speed * speed ) / ( 2 * deceleration ) * ( distance < 0 ? -1 : 1 );\r
- duration = speed / deceleration;\r
-\r
- if( destination < lowerMargin ){\r
- destination = wrapperSize ? lowerMargin - ( wrapperSize / 2.5 * ( speed / 8 ) ) : lowerMargin;\r
- distance = Math.abs( destination - current );\r
- duration = distance / speed;\r
+ if( scrollBox && scrollBox.hasVScroll ){\r
+ if( !XUI_ScrollBox_indicatorV ){\r
+ XUI_ScrollBox_indicatorV = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorV' );\r
+ };\r
+ if( scrollBox.xnode !== XUI_ScrollBox_indicatorV.parent ){\r
+ console.log( '*** Scroll Indicator add ***' );\r
+ scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorV );\r
+ XUI_ScrollBox_indicatorV[ 'animate' ]({\r
+ 'from' : { opacity : 0 },\r
+ 'to' : { opacity : 0.5 },\r
+ 'duration' : 900,\r
+ 'easing' : 'circular',\r
+ 'lazyRelease' : 300\r
+ });\r
+ scrollBox\r
+ [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+ };\r
} else\r
- if ( destination > 0 ) {\r
- destination = wrapperSize ? wrapperSize / 2.5 * ( speed / 8 ) : 0;\r
- distance = Math.abs( current ) + destination;\r
- duration = distance / speed;\r
+ if( XUI_ScrollBox_indicatorV ){\r
+ console.log( '*** Scroll Indicator remove ***' );\r
+ XUI_ScrollBox_indicatorV[ 'remove' ]();\r
+ };\r
+ \r
+ if( scrollBox && scrollBox.hasHScroll ){\r
+ if( !XUI_ScrollBox_indicatorH ){\r
+ XUI_ScrollBox_indicatorH = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorH' );\r
+ };\r
+ if( scrollBox.xnode !== XUI_ScrollBox_indicatorH.parent ){ \r
+ scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorH );\r
+ XUI_ScrollBox_indicatorH[ 'animate' ]({\r
+ 'from' : { opacity : 0 },\r
+ 'to' : { opacity : 0.5 },\r
+ 'duration' : 900,\r
+ 'easing' : 'circular',\r
+ 'lazyRelease' : 300\r
+ });\r
+ scrollBox\r
+ [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent ); \r
+ };\r
+ } else\r
+ if( XUI_ScrollBox_indicatorH ){\r
+ XUI_ScrollBox_indicatorH[ 'remove' ]();\r
};\r
+ \r
+ XUI_ScrollBox_current = scrollBox;\r
+};\r
\r
- return {\r
- destination : Math.round( destination ),\r
- duration : duration\r
+function XUI_ScrollBox_indicatorHandleEvent( e ){\r
+ //if( !XUI_ScrollBox_useCSSP ) return;\r
+ switch( e.type ){\r
+ case X_EVENT_CANCELED :\r
+ case XUI_Event.SCROLL_END :\r
+ console.log( '-fadeout-' );\r
+ this[ 'animate' ]({\r
+ 'from' : { opacity : 0.5 },\r
+ 'to' : { opacity : 0 },\r
+ 'duration' : 900,\r
+ 'easing' : 'circular',\r
+ 'lazyRelease' : 300\r
+ });\r
+ break;\r
};\r
};\r
\r
+\r
var X_UI_ScrollBox_SUPPORT_ATTRS = {\r
// スクロール開始するために必要な移動距離、縦か横、どちらか制限する場合、より重要\r
directionLockThreshold : [ 10, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.LENGTH ],\r
scrollYEnabled : [ true, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.BOOLEAN ],\r
scrollEnabled : [ true, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.BOOLEAN ],\r
bounceEnabled : [ true, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.BOOLEAN ],\r
- bounceTime : [ 600, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.TIME ],\r
+ bounceTime : [ 300, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.TIME ],\r
useWheel : [ true, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.BOOLEAN ],\r
useKey : [ true, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.BOOLEAN ],\r
hasScrollShadow : [ true, XUI_Dirty.CLEAN, XUI_Attr_USER.UINODE, XUI_Attr_Type.BOOLEAN ],\r
\r
var XUI_ScrollBox = XUI_ChromeBox.inherits(\r
'_ScrollBox',\r
- X_Class.PRIVATE_DATA,\r
+ X_Class.NONE,\r
{\r
+ layout : XUI_Layout_Canvas,\r
+ \r
directionLockThreshold : 10,\r
scrollXEnabled : true,\r
scrollYEnabled : true,\r
hasScrollShadow : true,\r
scrollShadowColor : '#000',\r
\r
- supportAttrs : XUI_Attr_createAttrDef( XUI_Attr_Support, X_UI_ScrollBox_SUPPORT_ATTRS ),\r
- \r
scrolling : false,\r
\r
initiated : '',\r
directionLocked : '',\r
startTime : 0,\r
endTime : 0,\r
- isAnimating : false,\r
isInTransition : false,\r
\r
hasHScroll : false,\r
_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
- this.xnodeSlider = this._containerNode.xnode[ 'className' ]( 'ScrollSlider' ).listen( X_EVENT_ANIME_END, this, X_UI_ScrollBox_onAnimeEnd );\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
\r
this.lastScrollHeight !== this._containerNode.boxHeight ||\r
this.lastBoxWidth !== this.boxWidth || this.lastBoxHeight !== this.boxHeight\r
){\r
- X_UI_rootData[ 'listenOnce' ]( XUI_Event.LAYOUT_COMPLETE, this, X_UI_ScrollBox_onLayoutComplete );\r
+ console.log( 'scroll - calc' );\r
+ XUI_rootData[ 'listenOnce' ]( XUI_Event.LAYOUT_COMPLETE, this, X_UI_ScrollBox_onLayoutComplete );\r
};\r
},\r
\r
\r
_remove : function(){\r
XUI_AbstractUINode.prototype._remove.apply( this, arguments );\r
+ \r
if( this.scrolling ){\r
- // remove scroll\r
+ // scroller 削除\r
+ this[ 'unlisten' ]( XUI_Event._POINTER_DOWN, X_UI_ScrollBox_onStart )\r
+ [ 'unlisten' ]( XUI_Event.DRAG, X_UI_ScrollBox_onMove )\r
+ [ 'unlisten' ]( XUI_Event.DRAG_END, X_UI_ScrollBox_onEnd );\r
+ XUI_rootData[ 'unlisten' ]( XUI_Event.LAYOUT_BEFORE, this, X_UI_ScrollBox_onLayoutBefore );\r
+ \r
+ XUI_rootData[ 'unlisten' ]( XUI_Event.LAYOUT_COMPLETE, this, X_UI_ScrollBox_onLayoutComplete );\r
+ this[ 'unlisten' ]( XUI_Event.SCROLL_END, XUI_rootData, XUI_rootData.calculate );\r
+ \r
+ XUI_ScrollBox_useCSSP ? this.xnodeSlider[ 'stop' ]() : this.xnode[ 'stop' ]();\r
+ \r
+ XUI_ScrollBox_current === this && XUI_ScrollBox_start( null );\r
+ \r
+ this.scrolling = false;\r
};\r
}\r
\r
);\r
\r
function X_UI_ScrollBox_onLayoutBefore( e ){\r
- if( e[ 'cancelable' ] && this.isInTransition && X_Node_Anime_translateZ ){\r
- this[ 'listenOnce' ]( XUI_Event.SCROLL_END, X_UI_rootData, X_UI_rootData.calculate );\r
- return X_Callback_PREVENT_DEFAULT;\r
+ if( e[ 'cancelable' ] && this.isInTransition && X_NodeAnime_translateZ ){\r
+ this[ 'listenOnce' ]( XUI_Event.SCROLL_END, XUI_rootData, XUI_rootData.calculate );\r
+ return X_CALLBACK_PREVENT_DEFAULT;\r
};\r
- this.scrollXRatio = this.scrollX ? this.scrollXMax / this.scrollX : 0;\r
- this.scrollYRatio = this.scrollY ? this.scrollYMax / this.scrollY : 0;\r
- this.xnodeSlider.stop();\r
+ this.scrollXRatio = this.scrollX / this.scrollXMax;\r
+ this.scrollYRatio = this.scrollY / this.scrollYMax;\r
+ XUI_ScrollBox_useCSSP ? this.xnodeSlider[ 'stop' ]() : this.xnode[ 'stop' ]();\r
this.isInTransition = false;\r
- return X_Callback_NONE;\r
+ return X_CALLBACK_NONE;\r
};\r
\r
function X_UI_ScrollBox_onLayoutComplete( e ){\r
// scroll の停止、GPU の解除\r
- var font = this.fontSize = this.xnodeSlider.call( 'fontSize' );\r
- \r
- this.scrollXMax = ( this.boxWidth - this._containerNode.boxWidth ) * font;\r
- this.scrollYMax = ( this.boxHeight - this._containerNode.boxHeight ) * font;\r
+ var font = this.fontSize = this.xnodeSlider[ 'call' ]( 'fontSize' );\r
\r
- this.hasHScroll = this.scrollXEnabled && this.scrollXMax < 0;\r
- this.hasVScroll = this.scrollYEnabled && this.scrollYMax < 0;\r
+ this.scrollXMax = ( this.boxWidth - this._containerNode.boxWidth ) * font | 0;\r
+ this.scrollYMax = ( this.boxHeight - this._containerNode.boxHeight ) * font | 0;\r
+\r
+ this.hasHScroll = this.scrollXEnabled && ( this.scrollXMax < -1 ); // < 0 だと \r
+ this.hasVScroll = this.scrollYEnabled && ( this.scrollYMax < -1 );\r
\r
if( !this.hasHScroll ){\r
this.scrollXMax = 0;\r
X_UI_ScrollBox_translate( this, this.scrollXMax * this.scrollXRatio, this.scrollYMax * this.scrollYRatio, 100, '', 300 );\r
} else {\r
// scroller 作る\r
- this[ 'listen' ]( XUI_Event._POINTER_DOWN, this, X_UI_ScrollBox_onStart );\r
- X_UI_rootData[ 'listen' ]( XUI_Event.LAYOUT_BEFORE, this, X_UI_ScrollBox_onLayoutBefore );\r
+ this[ 'listen' ]( XUI_Event._POINTER_DOWN, X_UI_ScrollBox_onStart )\r
+ [ 'listen' ]( XUI_Event.DRAG, X_UI_ScrollBox_onMove )\r
+ [ 'listen' ]( XUI_Event.DRAG_END, X_UI_ScrollBox_onEnd );\r
+ XUI_rootData[ 'listen' ]( XUI_Event.LAYOUT_BEFORE, this, X_UI_ScrollBox_onLayoutBefore );\r
\r
X_UI_ScrollBox_translate( this, this.scrollXMax * this.scrollXRatio, this.scrollYMax * this.scrollYRatio, 100, '', 300 );\r
this.scrolling = true;\r
// scroll 不要\r
if( this.scrolling ){\r
// scroller 削除\r
- this[ 'unlisten' ]( XUI_Event._POINTER_DOWN, this, X_UI_ScrollBox_onStart );\r
- X_UI_rootData[ 'unlisten' ]( XUI_Event.LAYOUT_BEFORE, this, X_UI_ScrollBox_onLayoutBefore );\r
+ this[ 'unlisten' ]( XUI_Event._POINTER_DOWN, X_UI_ScrollBox_onStart )\r
+ [ 'unlisten' ]( XUI_Event.DRAG, X_UI_ScrollBox_onMove )\r
+ [ 'unlisten' ]( XUI_Event.DRAG_END, X_UI_ScrollBox_onEnd );\r
+ XUI_rootData[ 'unlisten' ]( XUI_Event.LAYOUT_BEFORE, this, X_UI_ScrollBox_onLayoutBefore );\r
\r
( this.scrollX !== 0 || this.scrollY !== 0 ) && X_UI_ScrollBox_translate( this, 0, 0, 100, '', 300 );\r
\r
};\r
};\r
\r
- // TODO use scrollLeft, scrollTop\r
- function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release ){\r
- \r
- opt_time = 0 <= opt_time ? opt_time : 0;\r
- opt_easing = opt_easing === '' ? '' : opt_easing || 'circular';\r
- opt_release = 0 <= opt_release ? opt_release : 300;\r
- \r
- that.xnodeSlider.animate(\r
- {\r
- x : that.scrollX,\r
- y : that.scrollY\r
- },\r
- {\r
- x : x,\r
- y : y\r
- },\r
- opt_time, opt_easing, opt_release\r
- );\r
- \r
- that.scrollX = x;\r
- that.scrollY = y;\r
- \r
- if( that.indicators ){\r
- for( i = that.indicators.length; i--; ){\r
- that.indicators[ i ].updatePosition();\r
- };\r
- };\r
- };\r
+// TODO use scrollLeft, scrollTop\r
+function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release ){\r
+ var scrollBoxH = that.fontSize * that.boxHeight,\r
+ scrollBoxW = that.fontSize * that.boxWidth,\r
+ indicatorH, indicatorW;\r
+ \r
+ opt_time = 0 <= opt_time ? opt_time : 0;\r
+ opt_easing = opt_easing === '' ? '' : opt_easing || 'circular';\r
+ opt_release = 0 <= opt_release ? opt_release : 300;\r
+ \r
+ console.log( 'scr ' + y );\r
+ \r
+ if( !XUI_ScrollBox_useCSSP ){\r
+ that.xnode[ 'animate' ]({\r
+ 'from' : {\r
+ scrollX : -that.scrollX,\r
+ scrollY : -that.scrollY\r
+ },\r
+ 'to' : {\r
+ scrollX : -x,\r
+ scrollY : -y\r
+ },\r
+ 'duration' : opt_time,\r
+ 'easing' : opt_easing\r
+ }); \r
+ } else {\r
+ that.xnodeSlider[ 'animate' ]({\r
+ 'from' : {\r
+ x : that.scrollX,\r
+ y : that.scrollY\r
+ },\r
+ 'to' : {\r
+ x : x,\r
+ y : y\r
+ },\r
+ 'duration' : opt_time,\r
+ 'easing' : opt_easing,\r
+ 'lazyRelease' : opt_release\r
+ }); \r
+ };\r
\r
-function X_UI_ScrollBox_onStart( e ){\r
- var ret = X_Callback_NONE;\r
+ if( X_UA[ 'IE' ] < 6 ){\r
+ XUI_ScrollBox_indicatorV && XUI_ScrollBox_indicatorV[ 'css' ]( 'left', ( scrollBoxW - that.fontSize * 0.6 | 0 ) + 'px' );\r
+ XUI_ScrollBox_indicatorH && XUI_ScrollBox_indicatorH[ 'css' ]( 'top' , ( scrollBoxH - that.fontSize * 0.6 | 0 ) + 'px' );\r
+ };\r
\r
- // React to left mouse button only\r
- if( e.pointerType === 'mouse' && e.button !== 0 ){\r
- return ret;\r
+ if( that.hasVScroll && XUI_ScrollBox_indicatorV && XUI_ScrollBox_indicatorV.parent === that.xnode ){\r
+ indicatorH = scrollBoxH * scrollBoxH / ( - that.scrollYMax + scrollBoxH );\r
+ scrollBoxH -= indicatorH;\r
+\r
+ XUI_ScrollBox_indicatorV\r
+ [ 'css' ]({\r
+ height : ( indicatorH | 0 ) + 'px'\r
+ })\r
+ [ 'animate' ]({\r
+ 'from' : {\r
+ y : scrollBoxH * that.scrollY / that.scrollYMax },\r
+ 'to' : {\r
+ y : scrollBoxH * y / that.scrollYMax,\r
+ opacity : 0.5\r
+ },\r
+ 'duration' : opt_time,\r
+ 'easing' : opt_easing,\r
+ 'lazyRelease' : opt_release\r
+ });\r
};\r
+ if( that.hasHScroll && XUI_ScrollBox_indicatorH && XUI_ScrollBox_indicatorH.parent === that.xnode ){\r
+ indicatorW = scrollBoxW * scrollBoxW / ( - that.scrollXMax + scrollBoxW );\r
+ scrollBoxW -= indicatorW;\r
+ XUI_ScrollBox_indicatorH\r
+ [ 'css' ]({\r
+ width : ( indicatorW | 0 ) + 'px'\r
+ })\r
+ [ 'animate' ]({\r
+ 'from' : {\r
+ x : scrollBoxW * that.scrollX / that.scrollXMax },\r
+ 'to' : {\r
+ x : scrollBoxW * x / that.scrollXMax,\r
+ opacity : 0.5\r
+ },\r
+ 'duration' : opt_time,\r
+ 'easing' : opt_easing,\r
+ 'lazyRelease' : opt_release\r
+ });\r
+ };\r
+ \r
+ that.scrollX = x;\r
+ that.scrollXEm = x / that.fontSize;\r
+ that.scrollY = y;\r
+ that.scrollYEm = y / that.fontSize;\r
+};\r
+\r
+function X_UI_ScrollBox_onStart( e ){\r
+ var ret = X_CALLBACK_NONE;\r
\r
if( !this.scrollEnabled || ( this.initiated && e.pointerType !== this.initiated ) ){\r
return ret;\r
this.startTime = X_Timer_now();\r
\r
// スクロール中の停止\r
- if( this.isInTransition || this.isAnimating ){\r
- this.isInTransition = this.isAnimating = false;\r
+ if( this.isInTransition ){\r
+ this.isInTransition = false;\r
+ //console.log( '-1-' );\r
this[ 'dispatch' ]( XUI_Event.SCROLL_END );\r
- this.xnodeSlider.stop();\r
- }; \r
+ // TODO current位置\r
+ XUI_ScrollBox_useCSSP ? this.xnodeSlider[ 'stop' ]() : this.xnode[ 'stop' ]();\r
+ };\r
\r
this.startX = this.scrollX;\r
this.startY = this.scrollY;\r
this.pointX = e.pageX;\r
this.pointY = e.pageY;\r
\r
- this[ 'listen' ]( XUI_Event._POINTER_MOVE, this, X_UI_ScrollBox_onMove );\r
- this[ 'listen' ]( [ XUI_Event._POINTER_UP, XUI_Event._POINTER_CANCEL ], this, X_UI_ScrollBox_onEnd );\r
+ console.log( 'scrollstart ' + e.pageY + e.target.className() );\r
\r
- return ret | X_Callback_PREVENT_DEFAULT;\r
+ return ret | X_CALLBACK_PREVENT_DEFAULT;\r
};\r
\r
function X_UI_ScrollBox_onMove( e ){\r
- var ret = X_Callback_NONE,\r
+ var ret = X_CALLBACK_NONE,\r
deltaX, deltaY, timestamp,\r
newX, newY,\r
absDistX, absDistY;\r
// 規定以上の move でスクロール開始\r
- \r
+\r
+//console.log( 'scrollmove ' + e.buttons + ' ' + e.button );\r
+\r
if( !this.scrollEnabled || e.pointerType !== this.initiated ){\r
return ret;\r
};\r
- \r
- if( e.buttons !== 1 ){\r
- return X_UI_ScrollBox_onEnd.call( this, e );\r
- };\r
\r
// gpu の用意\r
- if( !this.xnodeSlider[ '_anime' ] ){\r
+ if( !XUI_ScrollBox_useCSSP ? ( !this.xnode[ '_anime' ] || !this.xnode[ '_anime' ].phase ) : ( !this.xnodeSlider[ '_anime' ] || !this.xnodeSlider[ '_anime' ].phase ) ){\r
//console.log( 'gpuレイヤーの用意 ' + e.pageY );\r
//console.log( 'mov1 x:' + this.scrollX + ' y:' + this.scrollY );\r
X_UI_ScrollBox_translate( this, this.scrollX, this.scrollY, 0, '', 300 );\r
this.moved = true;\r
this.minusX = deltaX;\r
this.minusY = deltaY;\r
+ // indicator\r
+ XUI_ScrollBox_start( this );\r
} else {\r
this[ 'dispatch' ]( XUI_Event.SCROLL_MOVE );\r
};\r
this.directionX = 0 < deltaX ? -1 : deltaX < 0 ? 1 : 0;\r
this.directionY = 0 < deltaY ? -1 : deltaY < 0 ? 1 : 0;\r
\r
- //console.log( 'mov2 x:' + newX + ' y:' + newY );\r
+ console.log( 'mov2 x:' + newX + ' y:' + newY );\r
X_UI_ScrollBox_translate( this, newX, newY, 0, '', 300 );\r
\r
if( 300 < timestamp - this.startTime ){\r
this.startY = this.scrollY;\r
};\r
// イベントの拘束\r
- return ret | X_Callback_PREVENT_DEFAULT | X_Callback_CAPTURE_POINTER;\r
+ return ret | X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_CAPTURE_POINTER;\r
};\r
\r
function X_UI_ScrollBox_onEnd( e ){\r
- var ret = X_Callback_NONE,\r
+ var ret = X_CALLBACK_NONE,\r
time = 0,\r
easing = '',\r
newX, newY,\r
momentumX, momentumY,\r
duration, distanceX, distanceY;\r
- \r
- this[ 'unlisten' ]( XUI_Event._POINTER_MOVE, this, X_UI_ScrollBox_onMove );\r
- this[ 'unlisten' ]( [ XUI_Event._POINTER_UP, XUI_Event._POINTER_CANCEL ], this, X_UI_ScrollBox_onEnd );\r
+ \r
+ //console.log( e.type + ' onend ' + XUI_Event.POINTER_OUT );\r
\r
if( !this.scrollEnabled || e.pointerType !== this.initiated ){\r
+ //console.log( e.type + ' onend 1 ' + e.pointerType + ' ' + this.initiated );\r
return ret;\r
};\r
\r
\r
// reset if we are outside of the boundaries\r
if( X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){\r
- return ret;\r
+ //console.log( e.type + ' onend 2 ' + XUI_Event.POINTER_OUT );\r
+ return ret | X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_RELEASE_POINTER;\r
};\r
\r
// we scrolled less than 10 pixels\r
if( !this.moved ){\r
- // this[ 'dispatch' ]( X_EVENT_CANCELED );\r
- console.log( 'we scrolled less than 10 pixels' );\r
- return ret;\r
+ this[ 'dispatch' ]( X_EVENT_CANCELED );\r
+ //console.log( 'we scrolled less than 10 pixels ' + e.pageY );\r
+ return ret | X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_RELEASE_POINTER;\r
};\r
\r
// start momentum animation if needed\r
time = Math.max( momentumX.duration, momentumY.duration ) | 0;\r
this.isInTransition = true;\r
} else {\r
- console.log( '慣性無し' );\r
+ //console.log( '慣性無し' );\r
};\r
\r
if( newX != this.scrollX || newY != this.scrollY ){\r
easing = 'quadratic';\r
};\r
\r
- console.log( 'end2 x:' + newX + ' y:' + newY + ' t:' + time );\r
+ //console.log( 'end2 x:' + newX + ' y:' + newY + '<-y:' + this.scrollY + ' t:' + time );\r
this.scrollTo( newX, newY, time, easing, 1000 );\r
- return ret;\r
+ } else {\r
+ //console.log( 'end1 x:' + newX + ' y:' + newY );\r
+ this.scrollTo( newX, newY, 0, '', 1000 ); // ensures that the last position is rounded\r
+ //console.log( '-3-' );\r
+ this[ 'dispatch' ]( XUI_Event.SCROLL_END ); \r
};\r
\r
- console.log( 'end1 x:' + newX + ' y:' + newY );\r
- this.scrollTo( newX, newY, 0, '', 1000 ); // ensures that the last position is rounded\r
-\r
- this[ 'dispatch' ]( XUI_Event.SCROLL_END );\r
- \r
- return ret;\r
+ return ret | X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_RELEASE_POINTER;\r
};\r
\r
function X_UI_ScrollBox_resetPosition( that, time ){\r
};\r
\r
if( x === that.scrollX && y === that.scrollY ){\r
- console.log( 'no バウンド y:' + y + ' max:' + that.scrollYMax );\r
+ //console.log( 'no バウンド y:' + y + ' max:' + that.scrollYMax );\r
return false;\r
};\r
\r
- //console.log( 'バウンド!' );\r
- //console.log( 'rese x:' + x + ' y:' + y );\r
+ //console.log( ' ===> resetPosition - バウンド!' );\r
+ //console.log( ' x:' + x + ' y:' + y );\r
that.scrollTo( x, y, time, that.bounceEasing, 1000 );\r
\r
return true;\r
};\r
\r
function X_UI_ScrollBox_onAnimeEnd( e ){\r
- if( e.target !== this.xnodeSlider || !this.isInTransition ){\r
- return X_Callback_NONE;\r
- };\r
- if( !X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){\r
+ if( this.isInTransition && !X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){\r
this.isInTransition = false;\r
- this.dispatch( XUI_Event.SCROLL_END );\r
+ //console.log( '-2-' );\r
+ this[ 'dispatch' ]( XUI_Event.SCROLL_END );\r
+ };\r
+ //console.log(' -2.1- '+this.isInTransition );\r
+ return X_CALLBACK_NONE;\r
+};\r
+\r
+function X_UI_ScrollBox_momentum( current, start, time, lowerMargin, wrapperSize, deceleration ){\r
+ var distance = current - start,\r
+ speed = Math.abs( distance ) / time,\r
+ destination,\r
+ duration;\r
+\r
+ deceleration = deceleration === undefined ? 0.0006 : deceleration;\r
+\r
+ destination = current + ( speed * speed ) / ( 2 * deceleration ) * ( distance < 0 ? -1 : 1 );\r
+ duration = speed / deceleration;\r
+\r
+ if( destination < lowerMargin ){\r
+ destination = wrapperSize ? lowerMargin - ( wrapperSize / 2.5 * ( speed / 8 ) ) : lowerMargin;\r
+ distance = Math.abs( destination - current );\r
+ duration = distance / speed;\r
+ } else\r
+ if ( destination > 0 ) {\r
+ destination = wrapperSize ? wrapperSize / 2.5 * ( speed / 8 ) : 0;\r
+ distance = Math.abs( current ) + destination;\r
+ duration = distance / speed;\r
+ };\r
+\r
+ return {\r
+ destination : Math.round( destination ),\r
+ duration : duration\r
};\r
- return X_Callback_NONE;\r
};\r
\r
X.UI.ScrollBox = X.UI.ChromeBox.inherits(\r
'ScrollBox',\r
X_Class.NONE,\r
- XUI_ScrollBox,\r
{\r
Constructor : function(){\r
+ var supports, slider;\r
+ \r
+ if( XUI_ScrollBox.prototype.usableAttrs === XUI_ChromeBox.prototype.usableAttrs ){\r
+ XUI_ScrollBox.prototype.usableAttrs = supports = XUI_Attr_createAttrDef( XUI_Attr_Support, X_UI_ScrollBox_SUPPORT_ATTRS );\r
+ \r
+ XUI_ScrollBox.prototype.attrClass = XUI_Attr_preset( XUI_Box.prototype.attrClass, supports, { width : '100%', height : '100%', bgColor : 0x111111 } );\r
+ };\r
+ \r
var args = [\r
XUI_Layout_Vertical, \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
- arg, layout, attr;\r
+ l = arguments.length, i = 0, j = 1,\r
+ arg, attr;\r
\r
- for( ; i; ){\r
- arg = arguments[ --i ];\r
+ for( ; i < l; ++i ){\r
+ arg = arguments[ i ];\r
if( arg[ 'instanceOf' ] && arg[ 'instanceOf' ]( XUI_LayoutBase ) ){\r
- layout = arg;\r
+ args[ 0 ] = arg;\r
} else\r
if( arg[ 'instanceOf' ] && arg[ 'instanceOf' ]( X.UI.AbstractUINode ) ){\r
- args[ args.length ] = arg;\r
+ args[ ++j ] = arg;\r
} else\r
if( X_Type_isObject( arg ) ){\r
- attr = arg;\r
+ args[ ++j ] = attr = arg;\r
+ slider = attr.scrollSlider;\r
};\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
+ null,\r
+ [\r
+ slider || X.UI.VBox.apply( 0, args )\r
+ ]\r
+ )\r
);\r
\r
- attr && this.attr( attr );\r
+ //attr && this.attr( attr );\r
},\r
scrollX : function(){\r
\r
\r
}\r
}\r
-);
\ No newline at end of file
+);\r
+\r