X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fcommon%2Fjs%2Fjquery.mobile.tizen.scrollview.js;h=08ff1499555d5f1e97b5ea7c1a92029da430227b;hb=3f08f13c69c30821bcd1a6f1f010395afb8e356a;hp=6bc7f0475b257dc6fc1629b6f8adf9fd15cd4cf0;hpb=d1ea4c5d62438c778b76ca4f89a709e78a9750d1;p=framework%2Fweb%2Fweb-ui-fw.git diff --git a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js index 6bc7f04..08ff149 100644 --- a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js +++ b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js @@ -35,7 +35,7 @@ }; function getCurrentTime() { - return ( new Date() ).getTime(); + return Date.now(); } jQuery.widget( "tizen.scrollview", jQuery.mobile.widget, { @@ -470,6 +470,13 @@ target.is( '.ui-btn-inner' ) || target.is( '.ui-btn-inner .ui-icon' ); + if ( this._is_button ) { + if ( target.parents('.ui-slider-handle') ) { + this._skip_dragging = true; + return; + } + } + /* * We need to prevent the default behavior to * suppress accidental selection of text, etc. @@ -816,11 +823,13 @@ focused.trigger("resize.scrollview"); } - /* calibration */ - if ( self._sy < $c.height() - $v.height() ) { - self.scrollTo( 0, self._sy, - self.options.snapbackDuration ); - } + /* calibration - after triggered throttledresize */ + setTimeout( function () { + if ( self._sy < $c.height() - $v.height() ) { + self.scrollTo( 0, self._sy, + self.options.snapbackDuration ); + } + }, 260 ); self._view_height = $v.height(); });