Skip to content
This repository has been archived by the owner on Mar 27, 2019. It is now read-only.

Commit

Permalink
fix #413
Browse files Browse the repository at this point in the history
  • Loading branch information
Matteo Spinelli committed Jul 8, 2013
1 parent f414174 commit 1aabafc
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 21 deletions.
4 changes: 2 additions & 2 deletions build/iscroll-lite.js
@@ -1,4 +1,4 @@
/*! iScroll v5.0.2 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
/*! iScroll v5.0.3 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
var IScroll = (function (window, document, Math) {
var rAF = window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
Expand Down Expand Up @@ -296,7 +296,7 @@ function IScroll (el, options) {
}

IScroll.prototype = {
version: '5.0.2',
version: '5.0.3',

_init: function () {
this._initEvents();
Expand Down
9 changes: 6 additions & 3 deletions build/iscroll-probe.js
@@ -1,4 +1,4 @@
/*! iScroll v5.0.2 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
/*! iScroll v5.0.3 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
var IScroll = (function (window, document, Math) {
var rAF = window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
Expand Down Expand Up @@ -307,7 +307,7 @@ function IScroll (el, options) {
}

IScroll.prototype = {
version: '5.0.2',
version: '5.0.3',

_init: function () {
this._initEvents();
Expand Down Expand Up @@ -1732,7 +1732,10 @@ Indicator.prototype = {
y = this.maxPosY;
}

this.scroller.scrollTo(Math.round(x / this.sizeRatioX), Math.round(y / this.sizeRatioY));
x = this.options.listenX ? Math.round(x / this.sizeRatioX) : this.scroller.x;
y = this.options.listenY ? Math.round(y / this.sizeRatioY) : this.scroller.y;

this.scroller.scrollTo(x, y);
}
};

Expand Down
9 changes: 6 additions & 3 deletions build/iscroll-zoom.js
@@ -1,4 +1,4 @@
/*! iScroll v5.0.2 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
/*! iScroll v5.0.3 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
var IScroll = (function (window, document, Math) {
var rAF = window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
Expand Down Expand Up @@ -309,7 +309,7 @@ function IScroll (el, options) {
}

IScroll.prototype = {
version: '5.0.2',
version: '5.0.3',

_init: function () {
this._initEvents();
Expand Down Expand Up @@ -1895,7 +1895,10 @@ Indicator.prototype = {
y = this.maxPosY;
}

this.scroller.scrollTo(Math.round(x / this.sizeRatioX), Math.round(y / this.sizeRatioY));
x = this.options.listenX ? Math.round(x / this.sizeRatioX) : this.scroller.x;
y = this.options.listenY ? Math.round(y / this.sizeRatioY) : this.scroller.y;

this.scroller.scrollTo(x, y);
}
};

Expand Down
9 changes: 6 additions & 3 deletions build/iscroll.js
@@ -1,4 +1,4 @@
/*! iScroll v5.0.2 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
/*! iScroll v5.0.3 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
var IScroll = (function (window, document, Math) {
var rAF = window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
Expand Down Expand Up @@ -304,7 +304,7 @@ function IScroll (el, options) {
}

IScroll.prototype = {
version: '5.0.2',
version: '5.0.3',

_init: function () {
this._initEvents();
Expand Down Expand Up @@ -1714,7 +1714,10 @@ Indicator.prototype = {
y = this.maxPosY;
}

this.scroller.scrollTo(Math.round(x / this.sizeRatioX), Math.round(y / this.sizeRatioY));
x = this.options.listenX ? Math.round(x / this.sizeRatioX) : this.scroller.x;
y = this.options.listenY ? Math.round(y / this.sizeRatioY) : this.scroller.y;

this.scroller.scrollTo(x, y);
}
};

Expand Down
4 changes: 2 additions & 2 deletions dist/iscroll-lite-min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/iscroll-min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/iscroll-probe-min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/iscroll-zoom-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "iscroll",
"description": "Smooth scrolling for the web",
"version": "5.0.2",
"version": "5.0.3",
"homepage": "http://cubiq.org/iscroll-4",
"author": "Matteo Spinelli <matteo@cubiq.org> (http://cubiq.org)",
"keywords": [
Expand Down
5 changes: 4 additions & 1 deletion src/indicator/indicator.js
Expand Up @@ -293,6 +293,9 @@ Indicator.prototype = {
y = this.maxPosY;
}

this.scroller.scrollTo(Math.round(x / this.sizeRatioX), Math.round(y / this.sizeRatioY));
x = this.options.listenX ? Math.round(x / this.sizeRatioX) : this.scroller.x;
y = this.options.listenY ? Math.round(y / this.sizeRatioY) : this.scroller.y;

this.scroller.scrollTo(x, y);
}
};

0 comments on commit 1aabafc

Please sign in to comment.