\r
function XUI_ScrollBox_start( scrollBox ){\r
// 既存スクロールの停止\r
- if( scrollBox.hasVScroll ){\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
+ if( scrollBox && scrollBox.hasVScroll ){\r
if( !XUI_ScrollBox_indicatorV ){\r
XUI_ScrollBox_indicatorV = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorV' );\r
- \r
};\r
- XUI_ScrollBox_indicatorV.parent !== scrollBox.xnode && scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorV );\r
- XUI_ScrollBox_indicatorV[ 'animate' ](\r
- { opacity : 0 },\r
- { opacity : 1 },\r
- 900, 'circular', 300\r
- );\r
- scrollBox\r
- [ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\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
+ { opacity : 0 },\r
+ { opacity : 1 },\r
+ 900, 'circular', 300\r
+ );\r
+ scrollBox\r
+ [ 'listen' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );\r
+ };\r
+ } else\r
+ if( XUI_ScrollBox_indicatorV ){\r
+ console.log( '*** Scroll Indicator remove ***' );\r
+ XUI_ScrollBox_indicatorV[ 'remove' ]();\r
};\r
- if( scrollBox.hasHScroll ){\r
+ \r
+ if( scrollBox && scrollBox.hasHScroll ){\r
if( !XUI_ScrollBox_indicatorH ){\r
XUI_ScrollBox_indicatorH = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorH' );\r
};\r
- XUI_ScrollBox_indicatorH.parent !== scrollBox.xnode && scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorH );\r
- XUI_ScrollBox_indicatorH[ 'animate' ](\r
- { opacity : 0 },\r
- { opacity : 1 },\r
- 900, 'circular', 300\r
- );\r
- scrollBox\r
- [ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );\r
+ if( scrollBox.xnode !== XUI_ScrollBox_indicatorH.parent ){ \r
+ scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorH );\r
+ XUI_ScrollBox_indicatorH[ 'animate' ](\r
+ { opacity : 0 },\r
+ { opacity : 1 },\r
+ 900, 'circular', 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
function XUI_ScrollBox_indicatorHandleEvent( e ){\r
switch( e.type ){\r
case X_EVENT_CANCELED :\r
case XUI_Event.SCROLL_END :\r
+ console.log( '-fadeout-' );\r
this[ 'animate' ](\r
{ opacity : 1 },\r
{ opacity : 0 },\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.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.lastBoxWidth !== this.boxWidth || this.lastBoxHeight !== this.boxHeight\r
){\r
console.log( 'scroll - calc' );\r
- X_UI_rootData[ 'listenOnce' ]( XUI_Event.LAYOUT_COMPLETE, this, X_UI_ScrollBox_onLayoutComplete );\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
+ this.xnodeSlider[ '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
+ 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;\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
// TODO use scrollLeft, scrollTop\r
function X_UI_ScrollBox_translate( that, x, y, opt_time, opt_easing, opt_release ){\r
- var scrollBoxSize, indicatorSize;\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_time, opt_easing, opt_release\r
);\r
\r
- if( that.hasVScroll && XUI_ScrollBox_indicatorV ){\r
- scrollBoxSize = that.fontSize * that.boxHeight;\r
- indicatorSize = scrollBoxSize * scrollBoxSize / ( - that.scrollYMax + scrollBoxSize );\r
- scrollBoxSize -= indicatorSize;\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
+ 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 : ( indicatorSize | 0 ) + 'px'\r
+ height : ( indicatorH | 0 ) + 'px'\r
})\r
[ 'animate' ](\r
{\r
- y : scrollBoxSize * that.scrollY / that.scrollYMax\r
+ y : scrollBoxH * that.scrollY / that.scrollYMax\r
},\r
{\r
- y : scrollBoxSize * y / that.scrollYMax,\r
+ y : scrollBoxH * y / that.scrollYMax,\r
opacity : 1\r
},\r
opt_time, opt_easing, opt_release\r
);\r
};\r
- if( that.hasHScroll && XUI_ScrollBox_indicatorH ){\r
- scrollBoxSize = that.fontSize * that.boxWidth;\r
- indicatorSize = scrollBoxSize * scrollBoxSize / ( - that.scrollXMax + scrollBoxSize );\r
- scrollBoxSize -= indicatorSize;\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 : ( indicatorSize | 0 ) + 'px'\r
+ width : ( indicatorW | 0 ) + 'px'\r
})\r
[ 'animate' ](\r
{\r
- x : scrollBoxSize * that.scrollX / that.scrollXMax\r
+ x : scrollBoxW * that.scrollX / that.scrollXMax\r
},\r
{\r
- x : scrollBoxSize * x / that.scrollXMax,\r
+ x : scrollBoxW * x / that.scrollXMax,\r
opacity : 1\r
},\r
opt_time, opt_easing, opt_release\r
);\r
};\r
\r
- that.scrollX = x;\r
- that.scrollY = y;\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
- // React to left mouse button only\r
- if( e.pointerType === 'mouse' && e.button !== 0 ){\r
- return ret;\r
- };\r
\r
if( !this.scrollEnabled || ( this.initiated && e.pointerType !== this.initiated ) ){\r
return ret;\r
// スクロール中の停止\r
if( this.isInTransition ){\r
this.isInTransition = false;\r
- console.log( '-1-' );\r
+ //console.log( '-1-' );\r
this[ 'dispatch' ]( XUI_Event.SCROLL_END );\r
// TODO current位置\r
this.xnodeSlider[ 'stop' ]();\r
this.pointX = e.pageX;\r
this.pointY = e.pageY;\r
\r
- console.log( 'scrollstart ' + 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
};\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( !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
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 ' + e.pageY );\r
- return ret;\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
} else {\r
- console.log( 'end1 x:' + newX + ' y:' + newY );\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
+ //console.log( '-3-' );\r
this[ 'dispatch' ]( XUI_Event.SCROLL_END ); \r
};\r
- return ret;\r
+\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( ' ===> resetPosition - バウンド!' );\r
- console.log( ' 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 && !X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){\r
+ if( this.isInTransition && !X_UI_ScrollBox_resetPosition( this, this.bounceTime ) ){\r
this.isInTransition = false;\r
- console.log( '-2-' );\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
minHeight : '100%'\r
}\r
],\r
- i = arguments.length,\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
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
- args[ args.length ] = attr = arg;\r
+ args[ ++j ] = attr = arg;\r
slider = attr.scrollSlider;\r
};\r
};\r
OSDN Git Service
