-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(ionRefresher): allow custom text & icons
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> ```
- Loading branch information
Showing
7 changed files
with
228 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| describe('ionRefresher directive', function() { | ||
| beforeEach(module('ionic')); | ||
| function setup(attrs, scopeProps) { | ||
| var el; | ||
| inject(function($compile, $rootScope) { | ||
| var scope = $rootScope.$new(); | ||
| var ionicScrollCtrl = { | ||
| setRefresher: jasmine.createSpy('setRefresher'), | ||
| scrollView: { | ||
| finishPullToRefresh: jasmine.createSpy('finishPullToRefresh') | ||
| } | ||
| }; | ||
|
|
||
| angular.extend(scope, scopeProps || {}); | ||
|
|
||
| el = angular.element('<ion-refresher '+(attrs||'')+'></ion-refresher>'); | ||
| el.data('$$ionicScrollController', ionicScrollCtrl); | ||
|
|
||
| $compile(el)(scope); | ||
| $rootScope.$apply(); | ||
| }); | ||
| return el; | ||
| } | ||
|
|
||
| it('should error without ionicScroll', inject(function($compile, $rootScope) { | ||
| expect(function() { | ||
| $compile('<ion-refresher>')($rootScope); | ||
| }).toThrow(); | ||
| })); | ||
|
|
||
| it('should bind $onRefresh', function() { | ||
| var refreshSpy = jasmine.createSpy('onRefresh'); | ||
| var el = setup('on-refresh="refreshSpy()"', { | ||
| refreshSpy: refreshSpy | ||
| }); | ||
| expect(refreshSpy).not.toHaveBeenCalled(); | ||
| el.scope().$onRefresh(); | ||
| expect(refreshSpy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should bind $onRefreshOpening', function() { | ||
| var spyMe = jasmine.createSpy('onRefreshOpening'); | ||
| var el = setup('on-refresh-opening="spyMe()"', { | ||
| spyMe: spyMe | ||
| }); | ||
| expect(spyMe).not.toHaveBeenCalled(); | ||
| el.scope().$onRefreshOpening(); | ||
| expect(spyMe).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should setRefresher on scrollCtrl', function() { | ||
| var el = setup(); | ||
| expect(el.controller('$ionicScroll').setRefresher.callCount).toBe(1); | ||
| expect(el.controller('$ionicScroll').setRefresher).toHaveBeenCalledWith( | ||
| el.scope(), el[0] | ||
| ) | ||
| }); | ||
|
|
||
| it('should listen for scroll.refreshComplete', function() { | ||
| var el = setup(); | ||
| el.addClass('active'); | ||
| var ctrl = el.controller('$ionicScroll'); | ||
| expect(ctrl.scrollView.finishPullToRefresh).not.toHaveBeenCalled(); | ||
| el.scope().$broadcast('scroll.refreshComplete'); | ||
| expect(el.hasClass('active')).toBe(false); | ||
| expect(ctrl.scrollView.finishPullToRefresh).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should have default pullingIcon', function() { | ||
| var el = setup(); | ||
| expect(el[0].querySelector('.icon.icon-pulling.ion-arrow-down-c')).toBeTruthy(); | ||
| }); | ||
| it('should allow custom pullingIcon', function() { | ||
| var el = setup('pulling-icon="super-icon"'); | ||
| expect(el[0].querySelector('.icon.icon-pulling.ion-arrow-down-c')).toBeFalsy(); | ||
| expect(el[0].querySelector('.icon.icon-pulling.super-icon')).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should have default refreshingIcon', function() { | ||
| var el = setup(); | ||
| expect(el[0].querySelector('.icon.icon-refreshing.ion-loading-d')).toBeTruthy(); | ||
| }); | ||
| it('should allow custom refreshingIcon', function() { | ||
| var el = setup('refreshing-icon="monkey-icon"'); | ||
| expect(el[0].querySelector('.icon.icon-refreshing.ion-arrow-down-c')).toBeFalsy(); | ||
| expect(el[0].querySelector('.icon.icon-refreshing.monkey-icon')).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should have no text by default', function() { | ||
| var el = setup(); | ||
| expect(el.text().trim()).toBe(''); | ||
| }); | ||
| it('should allow pullingText', function() { | ||
| var el = setup('pulling-text="{{2+2}} <b>some</b> text"'); | ||
| expect(el[0].querySelector('span.icon-pulling').innerHTML).toBe('4 <b>some</b> text'); | ||
| }); | ||
| it('should allow refreshingText', function() { | ||
| var el = setup('refreshing-text="{{3+2}} <b>text</b>"'); | ||
| expect(el[0].querySelector('span.icon-refreshing').innerHTML).toBe('5 <b>text</b>'); | ||
| }); | ||
|
|
||
| }); |
Oops, something went wrong.