javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(ionRefresher): allow custom text & icons

Browse Source 
Closes #760

BREAKING CHANGE: on-refresh and on-refresh-opening are no longer on the
ion-content directive.  They are on the ion-refresher. In addition,
on-refresh-opening has been renamed to on-pulling.

Change your code from this:

```html
<ion-content on-refresh="onRefresh()"
  on-refresh-opening="onRefreshOpening()">
  <ion-refresher></ion-refresher>
</ion-content>
```

To this:

```html
<ion-content>
  <ion-refresher on-refresh="onRefresh()"
    on-pulling="onRefreshOpening()">
  </ion-refresher>
</ion-content>
```
This commit is contained in:
Andy Joslin
2014-03-11 16:26:59 -06:00
parent e4032339ec
commit 573df56db4
7 changed files with 228 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/ext/angular/test/controller/ionicScrollController.unit.js
View File

@@ -69,7 +69,7 @@ describe('$ionicScroll Controller', function() {
expect($ionicScrollDelegate.register).toHaveBeenCalledWith(scope, ctrl.$element, ctrl.scrollView);
}));
it('should not setup if no child .scroll-refresher', function() {
it('should not activatePullToRefresh if setRefresher is not called', function() {
setup();
timeout.flush();
expect(ctrl.refresher).toBeFalsy();
@@ -77,16 +77,7 @@ describe('$ionicScroll Controller', function() {
expect(ctrl.scrollView.activatePullToRefresh).not.toHaveBeenCalled();
});
it('should not setup ctrl.refresher until after timeout', function() {
setup({
el: angular.element('<div><div class="scroll-refresher"></div></div>')[0]
});
expect(ctrl.refresher).toBeUndefined();
timeout.flush();
expect(ctrl.refresher).toBe(ctrl.element.children[0]);
});
it('should work with .scroll-refresher child and proper refresher', function() {
it('should activatePullToRefresh and work when setRefresher', function() {
var startCb, refreshingCb, doneCb, refresherEl;
setup({
el: angular.element('<div><div class="scroll-refresher"></div></div>')[0]
@@ -96,6 +87,9 @@ describe('$ionicScroll Controller', function() {
refreshingCb = refreshing;
doneCb = done;
});
ctrl.setRefresher(scope, ctrl.element);
var scrollOnRefreshSpy = jasmine.createSpy('scroll.onRefresh');
scope.$onRefresh = jasmine.createSpy('onRefresh');
scope.$onRefreshOpening = jasmine.createSpy('onRefreshOpening');