mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 06:57:02 +08:00
Basic pull to refresh shell
This commit is contained in:
7
dist/css/ionic-scoped.css
vendored
7
dist/css/ionic-scoped.css
vendored
@ -171,6 +171,9 @@
|
|||||||
/**
|
/**
|
||||||
* A list divider.
|
* A list divider.
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
|
* List refreser elements
|
||||||
|
*/
|
||||||
/* the overall container of the toggle */
|
/* the overall container of the toggle */
|
||||||
/* hide the actual checkbox */
|
/* hide the actual checkbox */
|
||||||
/* the background of the toggle's track area */
|
/* the background of the toggle's track area */
|
||||||
@ -1856,6 +1859,10 @@
|
|||||||
.ionic .list-item-text {
|
.ionic .list-item-text {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
line-height: 1.3; }
|
line-height: 1.3; }
|
||||||
|
.ionic .list-refresher {
|
||||||
|
background-color: red;
|
||||||
|
height: 0;
|
||||||
|
overflow: hidden; }
|
||||||
.ionic form {
|
.ionic form {
|
||||||
margin: 0 0 1.42857; }
|
margin: 0 0 1.42857; }
|
||||||
.ionic legend {
|
.ionic legend {
|
||||||
|
|||||||
8
dist/css/ionic.css
vendored
8
dist/css/ionic.css
vendored
@ -2291,6 +2291,14 @@ a.list-item {
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
line-height: 1.3; }
|
line-height: 1.3; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List refreser elements
|
||||||
|
*/
|
||||||
|
.list-refresher {
|
||||||
|
background-color: red;
|
||||||
|
height: 0;
|
||||||
|
overflow: hidden; }
|
||||||
|
|
||||||
form {
|
form {
|
||||||
margin: 0 0 1.42857; }
|
margin: 0 0 1.42857; }
|
||||||
|
|
||||||
|
|||||||
76
dist/js/ionic.js
vendored
76
dist/js/ionic.js
vendored
@ -1852,6 +1852,65 @@ window.ionic = {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var PullToRefreshDrag = function(opts) {
|
||||||
|
this.dragThresholdY = opts.dragThresholdY || 10;
|
||||||
|
this.el = opts.el;
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype = new DragOp();
|
||||||
|
PullToRefreshDrag.prototype.start = function(e) {
|
||||||
|
var content, refresher;
|
||||||
|
|
||||||
|
content = ionic.DomUtil.getParentOrSelfWithClass(e.target, 'list');
|
||||||
|
if(!content) { return; }
|
||||||
|
|
||||||
|
// Grab the refresher element that will show as you drag down
|
||||||
|
refresher = content.querySelector('.list-refresher');
|
||||||
|
if(!refresher) {
|
||||||
|
refresher = this._injectRefresher();
|
||||||
|
}
|
||||||
|
|
||||||
|
this._currentDrag = {
|
||||||
|
refresher: refresher,
|
||||||
|
content: content
|
||||||
|
};
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype._injectRefresher = function() {
|
||||||
|
var refresher = document.createElement('div');
|
||||||
|
refresher.className = 'list-refresher';
|
||||||
|
this.el.insertBefore(refresher, this.el.firstChild);
|
||||||
|
return refresher;
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype.drag = function(e) {
|
||||||
|
var _this = this;
|
||||||
|
|
||||||
|
window.requestAnimationFrame(function() {
|
||||||
|
// We really aren't dragging
|
||||||
|
if(!_this._currentDrag) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if we should start dragging. Check if we've dragged past the threshold,
|
||||||
|
// or we are starting from the open state.
|
||||||
|
if(!_this._isDragging && Math.abs(e.gesture.deltaY) > _this.dragThresholdY) {
|
||||||
|
_this._isDragging = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(_this._isDragging) {
|
||||||
|
var currentHeight = parseFloat(_this._currentDrag.refresher.style.height);
|
||||||
|
_this._currentDrag.refresher.style.height = e.gesture.deltaY + 'px';
|
||||||
|
|
||||||
|
var newHeight = parseFloat(_this._currentDrag.refresher.style.height = e.gesture.deltaY);
|
||||||
|
var firstChildHeight = parseFloat(_this._currentDrag.refresher.firstElementChild.style.height);
|
||||||
|
console.log('New Height must pass', firstChildHeight);
|
||||||
|
if(newHeight > firstChildHeight) {
|
||||||
|
console.log('PASSED', firstChildHeight);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype.end = function(e) {
|
||||||
|
};
|
||||||
|
|
||||||
var SlideDrag = function(opts) {
|
var SlideDrag = function(opts) {
|
||||||
this.dragThresholdX = opts.dragThresholdX || 10;
|
this.dragThresholdX = opts.dragThresholdX || 10;
|
||||||
this.el = opts.el;
|
this.el = opts.el;
|
||||||
@ -2078,6 +2137,8 @@ window.ionic = {
|
|||||||
doneCallback && doneCallback();
|
doneCallback && doneCallback();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The ListView handles a list of items. It will process drag animations, edit mode,
|
* The ListView handles a list of items. It will process drag animations, edit mode,
|
||||||
* and other operations that are common on mobile lists or table views.
|
* and other operations that are common on mobile lists or table views.
|
||||||
@ -2103,10 +2164,12 @@ window.ionic = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ionic.views.List.prototype = {
|
ionic.views.List.prototype = {
|
||||||
|
|
||||||
_initDrag: function() {
|
_initDrag: function() {
|
||||||
this._isDragging = false;
|
this._isDragging = false;
|
||||||
this._dragOp = null;
|
this._dragOp = null;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Return the list item from the given target
|
// Return the list item from the given target
|
||||||
_getItem: function(target) {
|
_getItem: function(target) {
|
||||||
while(target) {
|
while(target) {
|
||||||
@ -2117,6 +2180,8 @@ window.ionic = {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_startDrag: function(e) {
|
_startDrag: function(e) {
|
||||||
this._isDragging = false;
|
this._isDragging = false;
|
||||||
|
|
||||||
@ -2128,16 +2193,22 @@ window.ionic = {
|
|||||||
this._dragOp = new ReorderDrag({ el: item });
|
this._dragOp = new ReorderDrag({ el: item });
|
||||||
this._dragOp.start(e);
|
this._dragOp.start(e);
|
||||||
}
|
}
|
||||||
return;
|
}
|
||||||
|
|
||||||
|
// Check if this is a "pull down" drag for pull to refresh
|
||||||
|
else if(e.gesture.direction == 'down') {
|
||||||
|
this._dragOp = new PullToRefreshDrag({ el: this.el });
|
||||||
|
this._dragOp.start(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Or check if this is a swipe to the side drag
|
// Or check if this is a swipe to the side drag
|
||||||
if(e.gesture.direction == 'left' || e.gesture.direction == 'right') {
|
else if(e.gesture.direction == 'left' || e.gesture.direction == 'right') {
|
||||||
this._dragOp = new SlideDrag({ el: this.el });
|
this._dragOp = new SlideDrag({ el: this.el });
|
||||||
this._dragOp.start(e);
|
this._dragOp.start(e);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_handleEndDrag: function(e) {
|
_handleEndDrag: function(e) {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
|
||||||
@ -2150,6 +2221,7 @@ window.ionic = {
|
|||||||
_this._initDrag();
|
_this._initDrag();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Process the drag event to move the item to the left or right.
|
* Process the drag event to move the item to the left or right.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -49,7 +49,10 @@
|
|||||||
<body>
|
<body>
|
||||||
|
|
||||||
<content has-header="true" ng-controller="TestCtrl" class="reveal-animation">
|
<content has-header="true" ng-controller="TestCtrl" class="reveal-animation">
|
||||||
<list is-editing="isEditingItems" animation="my-repeat-animation" delete-icon="icon-minus-circled" reorder-icon="icon-navicon">
|
<list is-editing="isEditingItems" on-refresh="refreshProjects()" animation="my-repeat-animation" delete-icon="icon-minus-circled" reorder-icon="icon-navicon">
|
||||||
|
<div class="list-refresher">
|
||||||
|
<div style="height: 100px; font-size: 30px; text-align: center">REFRESHING</div>
|
||||||
|
</div>
|
||||||
<list-item ng-repeat="item in items"
|
<list-item ng-repeat="item in items"
|
||||||
buttons="item.buttons"
|
buttons="item.buttons"
|
||||||
can-delete="true"
|
can-delete="true"
|
||||||
@ -75,6 +78,10 @@
|
|||||||
$scope.items.splice($scope.items.indexOf(item), 1);
|
$scope.items.splice($scope.items.indexOf(item), 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.refreshProjects = function() {
|
||||||
|
alert('refreshing!');
|
||||||
|
};
|
||||||
|
|
||||||
$scope.items = [
|
$scope.items = [
|
||||||
{
|
{
|
||||||
text: 'Item 1',
|
text: 'Item 1',
|
||||||
|
|||||||
@ -10,6 +10,65 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var PullToRefreshDrag = function(opts) {
|
||||||
|
this.dragThresholdY = opts.dragThresholdY || 10;
|
||||||
|
this.el = opts.el;
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype = new DragOp();
|
||||||
|
PullToRefreshDrag.prototype.start = function(e) {
|
||||||
|
var content, refresher;
|
||||||
|
|
||||||
|
content = ionic.DomUtil.getParentOrSelfWithClass(e.target, 'list');
|
||||||
|
if(!content) { return; }
|
||||||
|
|
||||||
|
// Grab the refresher element that will show as you drag down
|
||||||
|
refresher = content.querySelector('.list-refresher');
|
||||||
|
if(!refresher) {
|
||||||
|
refresher = this._injectRefresher();
|
||||||
|
}
|
||||||
|
|
||||||
|
this._currentDrag = {
|
||||||
|
refresher: refresher,
|
||||||
|
content: content
|
||||||
|
};
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype._injectRefresher = function() {
|
||||||
|
var refresher = document.createElement('div');
|
||||||
|
refresher.className = 'list-refresher';
|
||||||
|
this.el.insertBefore(refresher, this.el.firstChild);
|
||||||
|
return refresher;
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype.drag = function(e) {
|
||||||
|
var _this = this;
|
||||||
|
|
||||||
|
window.requestAnimationFrame(function() {
|
||||||
|
// We really aren't dragging
|
||||||
|
if(!_this._currentDrag) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if we should start dragging. Check if we've dragged past the threshold,
|
||||||
|
// or we are starting from the open state.
|
||||||
|
if(!_this._isDragging && Math.abs(e.gesture.deltaY) > _this.dragThresholdY) {
|
||||||
|
_this._isDragging = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(_this._isDragging) {
|
||||||
|
var currentHeight = parseFloat(_this._currentDrag.refresher.style.height);
|
||||||
|
_this._currentDrag.refresher.style.height = e.gesture.deltaY + 'px';
|
||||||
|
|
||||||
|
var newHeight = parseFloat(_this._currentDrag.refresher.style.height = e.gesture.deltaY);
|
||||||
|
var firstChildHeight = parseFloat(_this._currentDrag.refresher.firstElementChild.style.height);
|
||||||
|
console.log('New Height must pass', firstChildHeight);
|
||||||
|
if(newHeight > firstChildHeight) {
|
||||||
|
console.log('PASSED', firstChildHeight);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
PullToRefreshDrag.prototype.end = function(e) {
|
||||||
|
};
|
||||||
|
|
||||||
var SlideDrag = function(opts) {
|
var SlideDrag = function(opts) {
|
||||||
this.dragThresholdX = opts.dragThresholdX || 10;
|
this.dragThresholdX = opts.dragThresholdX || 10;
|
||||||
this.el = opts.el;
|
this.el = opts.el;
|
||||||
@ -236,6 +295,8 @@
|
|||||||
doneCallback && doneCallback();
|
doneCallback && doneCallback();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The ListView handles a list of items. It will process drag animations, edit mode,
|
* The ListView handles a list of items. It will process drag animations, edit mode,
|
||||||
* and other operations that are common on mobile lists or table views.
|
* and other operations that are common on mobile lists or table views.
|
||||||
@ -261,10 +322,12 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
ionic.views.List.prototype = {
|
ionic.views.List.prototype = {
|
||||||
|
|
||||||
_initDrag: function() {
|
_initDrag: function() {
|
||||||
this._isDragging = false;
|
this._isDragging = false;
|
||||||
this._dragOp = null;
|
this._dragOp = null;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Return the list item from the given target
|
// Return the list item from the given target
|
||||||
_getItem: function(target) {
|
_getItem: function(target) {
|
||||||
while(target) {
|
while(target) {
|
||||||
@ -275,6 +338,8 @@
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_startDrag: function(e) {
|
_startDrag: function(e) {
|
||||||
this._isDragging = false;
|
this._isDragging = false;
|
||||||
|
|
||||||
@ -286,16 +351,22 @@
|
|||||||
this._dragOp = new ReorderDrag({ el: item });
|
this._dragOp = new ReorderDrag({ el: item });
|
||||||
this._dragOp.start(e);
|
this._dragOp.start(e);
|
||||||
}
|
}
|
||||||
return;
|
}
|
||||||
|
|
||||||
|
// Check if this is a "pull down" drag for pull to refresh
|
||||||
|
else if(e.gesture.direction == 'down') {
|
||||||
|
this._dragOp = new PullToRefreshDrag({ el: this.el });
|
||||||
|
this._dragOp.start(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Or check if this is a swipe to the side drag
|
// Or check if this is a swipe to the side drag
|
||||||
if(e.gesture.direction == 'left' || e.gesture.direction == 'right') {
|
else if(e.gesture.direction == 'left' || e.gesture.direction == 'right') {
|
||||||
this._dragOp = new SlideDrag({ el: this.el });
|
this._dragOp = new SlideDrag({ el: this.el });
|
||||||
this._dragOp.start(e);
|
this._dragOp.start(e);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
_handleEndDrag: function(e) {
|
_handleEndDrag: function(e) {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
|
||||||
@ -308,6 +379,7 @@
|
|||||||
_this._initDrag();
|
_this._initDrag();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Process the drag event to move the item to the left or right.
|
* Process the drag event to move the item to the left or right.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -253,3 +253,14 @@ a.list-item {
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
line-height: 1.3;
|
line-height: 1.3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List refreser elements
|
||||||
|
*/
|
||||||
|
.list-refresher {
|
||||||
|
background-color: red;
|
||||||
|
height: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.list-refreshing {
|
||||||
|
}
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<link href="../dist/css/ionic.css" rel="stylesheet">
|
<link href="../dist/css/ionic.css" rel="stylesheet">
|
||||||
<style>
|
<style>
|
||||||
#slide-box {
|
#slide-box {
|
||||||
max-height: 400px;
|
max-height: 200px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
Reference in New Issue
Block a user