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

Much faster pull to refresh

Browse Source
This commit is contained in:
Max Lynch
2013-11-08 11:22:49 -06:00
parent 71eae9712b
commit 74e28c61c5
6 changed files with 82 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/css/ionic.css vendored
View File

@ -2290,8 +2290,8 @@ body, .ionic-body {
.scroll-refresher {
overflow: hidden;
height: 0;
background-color: white; }
height: 100px;
margin-top: -100px; }
.scroll-refreshing {
-webkit-transition: height 0.1s ease-in-out; }

56
dist/js/ionic.js vendored
View File

@ -1757,7 +1757,22 @@ window.ionic = {
window.setTimeout(callback, 1000 / 60);
};
})();
// Ionic CSS polyfills
ionic.CSS = {};
(function() {
var d = document.createElement('div');
var keys = ['webkitTransform', 'transform', '-webkit-transform', 'webkit-transform',
'-moz-transform', 'moz-transform', 'MozTransform', 'mozTransform'];
for(var i = 0; i < keys.length; i++) {
if(d.style[keys[i]] !== undefined) {
ionic.CSS.TRANSFORM = keys[i];
break;
}
}
})();
})(window.ionic);
;
@ -1980,6 +1995,9 @@ window.ionic = {
onRefreshOpening: function() {},
// Called when let go and is refreshing
onRefresh: function() {},
refreshEasing: EASING_FUNCTIONS.bounce,
// ms transition time
refreshEasingTime: 400,
// How frequently to fire scroll events in the case of
// a flick or momentum scroll where the finger is no longer
@ -2087,17 +2105,13 @@ window.ionic = {
time = 0;
}
if(time == Infinity) {
debugger;
}
var dx = ox - x;
var dy = oy - y;
el.offsetHeight;
el.style.webkitTransitionTimingFunction = easing;
el.style.webkitTransitionDuration = time;
el.style.webkitTransform = 'translate3d(' + x + 'px,' + y + 'px, 0)';
el.style[ionic.CSS.TRANSFORM] = 'translate3d(' + x + 'px,' + y + 'px, 0)';
// Stop any other momentum event callbacks
clearTimeout(this._momentumStepTimeout);
@ -2311,6 +2325,10 @@ window.ionic = {
return;
}
if(this._isHoldingRefresh) {
return;
}
var needsWrapping = this.needsWrapping();
// Triggered to end scroll, once the final animation has ended
@ -2376,6 +2394,7 @@ window.ionic = {
// Grab the refresher element if using Pull to Refresh
if(this.hasPullToRefresh) {
this._refresher = document.querySelector('.scroll-refresher');
this._refresherHeight = parseFloat(this._refresher.firstElementChild.offsetHeight) || 100;
if(this._refresher) {
this._refresher.classList.remove('scroll-refreshing');
}
@ -2461,10 +2480,7 @@ window.ionic = {
var newY = _this.y + deltaY;
// Check if the dragging is beyond the bottom or top
if(newY > 0) {
newY = _this.y + deltaY / _this.rubberBandResistance;
} else if ((-newY + parentHeight) > totalHeight) {
// Rubber band
if(newY > 0 || (-newY + parentHeight) > totalHeight) {
newY = _this.y + deltaY / _this.rubberBandResistance;
}
@ -2477,19 +2493,19 @@ window.ionic = {
if(_this._refresher && newY > 0) {
// We are pulling to refresh, so update the refresher
_this._refresher.style.height = newY + 'px';
var firstChildHeight = parseFloat(_this._refresher.firstElementChild.offsetHeight);
if(newY > firstChildHeight && !_this._isHoldingRefresh) {
//_this._refresher.style[ionic.CSS.TRANSFORM] = 'translate3d(0, ' + newY + 'px, 0)';
if(newY > _this._refresherHeight && !_this._isHoldingRefresh) {
_this._isHoldingRefresh = true;
// Trigger refresh holding event here
} else {
// Trigger refresh open amount
var ratio = Math.min(1, newY / firstChildHeight);
var ratio = Math.min(1, newY / _this._refresherHeight);
_this.onRefreshOpening && _this.onRefreshOpening(ratio);
}
// Update the new translated Y point of the container
_this.el.style.webkitTransform = 'translate3d(' + newX + 'px,0, 0)';
_this.el.style.webkitTransform = 'translate3d(' + newX + 'px,' + newY + 'px, 0)';
} else {
// Update the new translated Y point of the container
_this.el.style.webkitTransform = 'translate3d(' + newX + 'px,' + newY + 'px, 0)';
@ -2566,15 +2582,17 @@ window.ionic = {
if(_this._refresher && _this.y > 0) {
// Pull to refresh
var firstChildHeight = parseFloat(_this._refresher.firstElementChild.offsetHeight);
if(Math.ceil(_this.y) >= firstChildHeight) {
if(Math.ceil(_this.y) >= _this._refresherHeight) {
// REFRESH
_this._refresher.classList.add('scroll-refreshing');
_this._refresher.style.height = firstChildHeight + 'px';
//_this._refresher.style.height = firstChildHeight + 'px';
_this._scrollTo(0, _this._refresherHeight, 100, _this.refreshEasing);
_this.onRefresh && _this.onRefresh();
} else {
_this._refresher.classList.add('scroll-refreshing');
_this._refresher.style.height = 0 + 'px';
//_this._refresher.style.height = 0 + 'px';
_this._scrollTo(0, 0, _this.refreshEasingTime, _this.refreshEasing);
_this.onRefresh && _this.onRefresh();
}
return;

8
js/ext/angular/test/content.html
View File

@ -1,7 +1,7 @@
<html ng-app="navTest">
<head>
<meta charset="utf-8">
<title>Nav Bars</title>
<title>Content</title>
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
@ -37,13 +37,13 @@
}
.scroll-refresher {
background-color: #222;
border-bottom: 1px solid #eee;
}
#refresh-content {
color: #fff;
color: #999;
padding: 60px 0px;
text-align: center;
font-size: 30px;
font-size: 20px;
}
</style>

15
js/utils/poly.js
View File

@ -11,6 +11,21 @@
window.setTimeout(callback, 1000 / 60);
};
})();
// Ionic CSS polyfills
ionic.CSS = {};
(function() {
var d = document.createElement('div');
var keys = ['webkitTransform', 'transform', '-webkit-transform', 'webkit-transform',
'-moz-transform', 'moz-transform', 'MozTransform', 'mozTransform'];
for(var i = 0; i < keys.length; i++) {
if(d.style[keys[i]] !== undefined) {
ionic.CSS.TRANSFORM = keys[i];
break;
}
}
})();
})(window.ionic);

41
js/views/scrollView.js
View File

@ -86,6 +86,9 @@
onRefreshOpening: function() {},
// Called when let go and is refreshing
onRefresh: function() {},
refreshEasing: EASING_FUNCTIONS.bounce,
// ms transition time
refreshEasingTime: 400,
// How frequently to fire scroll events in the case of
// a flick or momentum scroll where the finger is no longer
@ -193,17 +196,13 @@
time = 0;
}
if(time == Infinity) {
debugger;
}
var dx = ox - x;
var dy = oy - y;
el.offsetHeight;
el.style.webkitTransitionTimingFunction = easing;
el.style.webkitTransitionDuration = time;
el.style.webkitTransform = 'translate3d(' + x + 'px,' + y + 'px, 0)';
el.style[ionic.CSS.TRANSFORM] = 'translate3d(' + x + 'px,' + y + 'px, 0)';
// Stop any other momentum event callbacks
clearTimeout(this._momentumStepTimeout);
@ -417,6 +416,10 @@
return;
}
if(this._isHoldingRefresh) {
return;
}
var needsWrapping = this.needsWrapping();
// Triggered to end scroll, once the final animation has ended
@ -482,6 +485,7 @@
// Grab the refresher element if using Pull to Refresh
if(this.hasPullToRefresh) {
this._refresher = document.querySelector('.scroll-refresher');
this._refresherHeight = parseFloat(this._refresher.firstElementChild.offsetHeight) || 100;
if(this._refresher) {
this._refresher.classList.remove('scroll-refreshing');
}
@ -567,10 +571,7 @@
var newY = _this.y + deltaY;
// Check if the dragging is beyond the bottom or top
if(newY > 0) {
newY = _this.y + deltaY / _this.rubberBandResistance;
} else if ((-newY + parentHeight) > totalHeight) {
// Rubber band
if(newY > 0 || (-newY + parentHeight) > totalHeight) {
newY = _this.y + deltaY / _this.rubberBandResistance;
}
@ -583,19 +584,19 @@
if(_this._refresher && newY > 0) {
// We are pulling to refresh, so update the refresher
_this._refresher.style.height = newY + 'px';
var firstChildHeight = parseFloat(_this._refresher.firstElementChild.offsetHeight);
if(newY > firstChildHeight && !_this._isHoldingRefresh) {
//_this._refresher.style[ionic.CSS.TRANSFORM] = 'translate3d(0, ' + newY + 'px, 0)';
if(newY > _this._refresherHeight && !_this._isHoldingRefresh) {
_this._isHoldingRefresh = true;
// Trigger refresh holding event here
} else {
// Trigger refresh open amount
var ratio = Math.min(1, newY / firstChildHeight);
var ratio = Math.min(1, newY / _this._refresherHeight);
_this.onRefreshOpening && _this.onRefreshOpening(ratio);
}
// Update the new translated Y point of the container
_this.el.style.webkitTransform = 'translate3d(' + newX + 'px,0, 0)';
_this.el.style.webkitTransform = 'translate3d(' + newX + 'px,' + newY + 'px, 0)';
} else {
// Update the new translated Y point of the container
_this.el.style.webkitTransform = 'translate3d(' + newX + 'px,' + newY + 'px, 0)';
@ -672,15 +673,17 @@
if(_this._refresher && _this.y > 0) {
// Pull to refresh
var firstChildHeight = parseFloat(_this._refresher.firstElementChild.offsetHeight);
if(Math.ceil(_this.y) >= firstChildHeight) {
if(Math.ceil(_this.y) >= _this._refresherHeight) {
// REFRESH
_this._refresher.classList.add('scroll-refreshing');
_this._refresher.style.height = firstChildHeight + 'px';
//_this._refresher.style.height = firstChildHeight + 'px';
_this._scrollTo(0, _this._refresherHeight, 100, _this.refreshEasing);
_this.onRefresh && _this.onRefresh();
} else {
_this._refresher.classList.add('scroll-refreshing');
_this._refresher.style.height = 0 + 'px';
//_this._refresher.style.height = 0 + 'px';
_this._scrollTo(0, 0, _this.refreshEasingTime, _this.refreshEasing);
_this.onRefresh && _this.onRefresh();
}
return;

4
scss/_scaffolding.scss
View File

@ -110,8 +110,8 @@ body, .ionic-body {
// Scroll refresher (for pull to refresh)
.scroll-refresher {
overflow: hidden;
height: 0;
background-color: white;
height: 100px;
margin-top: -100px;
}
.scroll-refreshing {
-webkit-transition: height 0.1s ease-in-out;