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

Fixed scroll end thing

Browse Source
This commit is contained in:
Max Lynch
2013-10-28 10:42:59 -05:00
parent 9afb405b77
commit a3edee2ff9
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dist/js/ionic.js vendored
View File

@ -2380,6 +2380,13 @@ window.ionic = {
} }
_this.scrollTo(newX, newY, time, easing); _this.scrollTo(newX, newY, time, easing);
} else {
// We are done
ionic.trigger(_this.scrollEndEventName, {
target: _this.el,
scrollLeft: _this.x,
scrollTop: _this.y
});
} }
}); });
} }
@ -3354,7 +3361,6 @@ window.ionic = {
didScroll: function(e) { didScroll: function(e) {
console.log('Scrolling', Date.now()); console.log('Scrolling', Date.now());
/*
if(this.isVirtual) { if(this.isVirtual) {
var itemHeight = this.itemHeight; var itemHeight = this.itemHeight;
var totalItems = this.el.children.length; var totalItems = this.el.children.length;
@ -3370,7 +3376,6 @@ window.ionic = {
var nodes = Array.prototype.slice.call(this.el.children, first, itemsPerPage); var nodes = Array.prototype.slice.call(this.el.children, first, itemsPerPage);
console.log('Showing these nodes:', nodes); console.log('Showing these nodes:', nodes);
} }
*/
}, },
_initDrag: function() { _initDrag: function() {

2
js/views/listViewScroll.js
View File

@ -394,7 +394,6 @@
didScroll: function(e) { didScroll: function(e) {
console.log('Scrolling', Date.now()); console.log('Scrolling', Date.now());
/*
if(this.isVirtual) { if(this.isVirtual) {
var itemHeight = this.itemHeight; var itemHeight = this.itemHeight;
var totalItems = this.el.children.length; var totalItems = this.el.children.length;
@ -410,7 +409,6 @@
var nodes = Array.prototype.slice.call(this.el.children, first, itemsPerPage); var nodes = Array.prototype.slice.call(this.el.children, first, itemsPerPage);
console.log('Showing these nodes:', nodes); console.log('Showing these nodes:', nodes);
} }
*/
}, },
_initDrag: function() { _initDrag: function() {

7
js/views/scrollView.js
View File

@ -571,6 +571,13 @@
} }
_this.scrollTo(newX, newY, time, easing); _this.scrollTo(newX, newY, time, easing);
} else {
// We are done
ionic.trigger(_this.scrollEndEventName, {
target: _this.el,
scrollLeft: _this.x,
scrollTop: _this.y
});
} }
}); });
} }