flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-10-31 03:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

more digging...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-16 18:45:50 +04:00
parent 0b84208373
commit 581dc652d8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext-lib/iscroll-custom.js
View File

@ -160,8 +160,10 @@ var m = Math,
that.scroller.style[transformOrigin] = '0 0'; that.scroller.style[transformOrigin] = '0 0';
if (that.options.useTransition) that.scroller.style[transitionTimingFunction] = 'cubic-bezier(0.33,0.66,0.66,1)'; if (that.options.useTransition) that.scroller.style[transitionTimingFunction] = 'cubic-bezier(0.33,0.66,0.66,1)';
if (that.options.useTransform) that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px)' + translateZ; if (that.options.useTransform)
else that.scroller.style.cssText += ';position:absolute;top:' + that.y + 'px;left:' + that.x + 'px'; that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px)' + translateZ;
else
that.scroller.style.cssText += ';position:absolute;top:' + that.y + 'px;left:' + that.x + 'px';
that.refresh(); that.refresh();
@ -402,8 +404,8 @@ iScroll.prototype = {
if (that.zoomed) { if (that.zoomed) {
scale = that.scale * that.lastScale; scale = that.scale * that.lastScale;
scale = Math.max(that.options.zoomMin, scale); //scale = Math.max(that.options.zoomMin, scale);
scale = Math.min(that.options.zoomMax, scale); //scale = Math.min(that.options.zoomMax, scale);
that.lastScale = scale / that.scale; that.lastScale = scale / that.scale;
that.scale = scale; that.scale = scale;
@ -426,13 +428,16 @@ iScroll.prototype = {
// Double tapped // Double tapped
clearTimeout(that.doubleTapTimer); clearTimeout(that.doubleTapTimer);
that.doubleTapTimer = null; that.doubleTapTimer = null;
if (that.options.onZoomStart) that.options.onZoomStart.call(that, e); // XXX change this to a double tap event...
//if (that.options.onZoomStart) that.options.onZoomStart.call(that, e);
/* XXX Zoom...
that.zoom(that.pointX, that.pointY, that.scale == 1 ? that.options.doubleTapZoom : 1); that.zoom(that.pointX, that.pointY, that.scale == 1 ? that.options.doubleTapZoom : 1);
if (that.options.onZoomEnd) { if (that.options.onZoomEnd) {
setTimeout(function() { setTimeout(function() {
that.options.onZoomEnd.call(that, e); that.options.onZoomEnd.call(that, e);
}, 200); // 200 is default zoom duration }, 200); // 200 is default zoom duration
} }
*/
} else if (this.options.handleClick) { } else if (this.options.handleClick) {
that.doubleTapTimer = setTimeout(function () { that.doubleTapTimer = setTimeout(function () {
that.doubleTapTimer = null; that.doubleTapTimer = null;
@ -511,6 +516,7 @@ iScroll.prototype = {
if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e);
}, },
// XXX
_resetPos: function (time) { _resetPos: function (time) {
var that = this, var that = this,
resetX = that.x >= 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x, resetX = that.x >= 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x,