javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 06:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #113 - scroll bouncing regardless of window size, fixes pull to refresh

Browse Source
This commit is contained in:
Max Lynch
2013-11-11 16:54:01 -06:00
parent 2ffb925a97
commit 262a4cc9a8
6 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/js/ionic.js vendored
View File

@ -2411,6 +2411,7 @@ window.ionic = {
var parentWidth = this.el.parentNode.offsetWidth;
var parentHeight = this.el.parentNode.offsetHeight;
/*
var maxX = Math.min(0, (-totalWidth + parentWidth));
var maxY = Math.min(0, (-totalHeight + parentHeight));
@ -2418,6 +2419,7 @@ window.ionic = {
if((this.isHorizontalEnabled && maxX == 0) || (this.isVerticalEnabled && maxY == 0)) {
return;
}
*/
this.x = scrollLeft;
this.y = scrollTop;
@ -3176,8 +3178,6 @@ window.ionic = {
this._isDragging = false;
console.log(e.gesture.direction);
// Check if this is a reorder drag
if(ionic.DomUtil.getParentOrSelfWithClass(e.target, ITEM_DRAG_CLASS) && (e.gesture.direction == 'up' || e.gesture.direction == 'down')) {
var item = this._getItem(e.target);