X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fhandler%2Fjs%2Fjquery.tizen.scrollview.handler.js;h=84afd6ea72a31dddea0ba0f237dd1965fd11822a;hb=911f83dddec30106c6e29695e0750c04b8cf8d81;hp=c6b33daf6ab6eb31705e4412bad9e5299524bc24;hpb=280231b7ec599115468ced78ba12d1fa467edcb7;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git diff --git a/src/widgets/handler/js/jquery.tizen.scrollview.handler.js b/src/widgets/handler/js/jquery.tizen.scrollview.handler.js index c6b33da..84afd6e 100755 --- a/src/widgets/handler/js/jquery.tizen.scrollview.handler.js +++ b/src/widgets/handler/js/jquery.tizen.scrollview.handler.js @@ -99,6 +99,7 @@ isHorizontal = ( scrollview.options.direction === "x" ), _$view = scrollview._$view, _$clip = scrollview._$clip, + scrollbar = $view.find( ".ui-scrollbar" ), handler = null, handlerThumb = null, viewLength = 0, @@ -131,8 +132,7 @@ return; } - $view.addClass( " ui-handler-" + theme ).append( [ prefix, direction, suffix ].join( "" ) ); - handler = $view.find( ".ui-handler" ); + handler = $( [ prefix, direction, suffix ].join( "" ) ).appendTo( $view.addClass( " ui-handler-" + theme ) ); handlerThumb = $view.find( ".ui-handler-thumb" ).hide(); handlerHeight = ( isHorizontal ? handlerThumb.width() : handlerThumb.height() ); handlerMargin = ( isHorizontal ? parseInt( handler.css( "right" ), 10 ) : parseInt( handler.css( "bottom" ), 10 ) ); @@ -207,17 +207,25 @@ if ( !scrollview.enableHandler() ) { return; } + calculateLength(); + if ( viewLength < 0 || clipLength < handlerHeight ) { + if ( scrollbar.is( ":hidden" ) ) { + scrollbar.show(); + } + return; + } + + if ( scrollbar.is( ":visible" ) ) { + scrollbar.hide(); + } + if ( moveTimer ) { clearInterval( moveTimer ); moveTimer = undefined; } - if ( viewLength < 0 || clipLength < handlerHeight ) { - return; - } - handlerThumb.addClass( "ui-handler-visible" ) .stop( true, true ) .fadeIn( 'fast' ); @@ -228,7 +236,7 @@ setHanderPostion( scrollview.getScrollPosition() ); }).bind( "scrollstop", function ( event ) { - if ( !scrollview.enableHandler() || viewLength < 0 ) { + if ( !scrollview.enableHandler() || viewLength < 0 || clipLength < handlerHeight ) { return; }