-
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($ionicScrollDelegate): add scrollTo(left,top,animate) to delegate
Also moves $ionicScrollDelegate.register to $ionicScroll controller, and makes `<scroll>` directive be registered with $ionicScrollDelegate.
- Loading branch information
Showing
10 changed files
with
158 additions
and
85 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
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,67 @@ | ||
| describe('Ionic Scroll Directive', function() { | ||
| var compile, element, scope; | ||
|
|
||
| beforeEach(module('ionic')); | ||
|
|
||
| beforeEach(inject(function($compile, $rootScope, $timeout, $window) { | ||
| compile = $compile; | ||
| scope = $rootScope; | ||
| timeout = $timeout; | ||
| window = $window; | ||
| ionic.Platform.setPlatform('Android'); | ||
| })); | ||
|
|
||
| it('Has $ionicScroll controller', function() { | ||
| element = compile('<scroll></scroll>')(scope); | ||
| expect(element.controller('$ionicScroll').element).toBe(element[0]); | ||
| }); | ||
|
|
||
| it('Has scroll-view class', function() { | ||
| element = compile('<scroll></scroll>')(scope); | ||
| expect(element.hasClass('scroll-view')).toBe(true); | ||
| }); | ||
|
|
||
| it('should add padding classname', function() { | ||
| element = compile('<scroll padding="true"></scroll>')(scope); | ||
| expect(element.children().eq(0).hasClass('padding')).toEqual(true); | ||
| var scrollElement = element.find('.scroll'); | ||
| expect(scrollElement.hasClass('padding')).toEqual(true); | ||
| }); | ||
|
|
||
| it('Enables bouncing by default', function() { | ||
| ionic.Platform.setPlatform('iPhone'); | ||
| element = compile('<content has-header="true"></scroll>')(scope); | ||
| scope.$apply(); | ||
| var newScope = element.isolateScope(); | ||
| var scrollView = scope.scrollView; | ||
| expect(scrollView.options.bouncing).toBe(true); | ||
| }); | ||
|
|
||
| it('Disables bouncing when has-bouncing = false', function() { | ||
| ionic.Platform.setPlatform('iPhone'); | ||
| element = compile('<content has-header="true" has-bouncing="false"></scroll>')(scope); | ||
| scope.$apply(); | ||
| var newScope = element.isolateScope(); | ||
| var scrollView = scope.scrollView; | ||
| expect(scrollView.options.bouncing).toBe(false); | ||
| }); | ||
|
|
||
| it('Disables bouncing by default on Android', function() { | ||
| ionic.Platform.setPlatform('Android'); | ||
| element = compile('<content has-header="true"></scroll>')(scope); | ||
| scope.$apply(); | ||
| var newScope = element.isolateScope(); | ||
| var scrollView = scope.scrollView; | ||
| expect(scrollView.options.bouncing).toBe(false); | ||
| }); | ||
|
|
||
| it('Should set start x and y', function() { | ||
| element = compile('<content start-x="100" start-y="300" has-header="true"></scroll>')(scope); | ||
| scope.$apply(); | ||
| var newScope = element.isolateScope(); | ||
| var scrollView = scope.scrollView; | ||
| var vals = scrollView.getValues(); | ||
| expect(vals.left).toBe(100); | ||
| expect(vals.top).toBe(300); | ||
| }); | ||
| }); |
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
Oops, something went wrong.