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(ionScroll): add has-bouncing=true/false attribute

Browse Source 
Closes #1573. Closes #1367.
This commit is contained in:
Andrew Joslin
2014-06-04 14:14:31 -06:00
parent f5f5851b2e
commit 00c80e8557
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/angular/directive/scroll.js vendored
View File

@@ -19,6 +19,8 @@
* @param {boolean=} zooming Whether to support pinch-to-zoom
* @param {integer=} min-zoom The smallest zoom amount allowed (default is 0.5)
* @param {integer=} max-zoom The largest zoom amount allowed (default is 3)
* @param {boolean=} has-bouncing Whether to allow scrolling to bounce past the edges
* of the content. Defaults to true on iOS, false on Android.
*/
IonicModule
.directive('ionScroll', [
@@ -70,6 +72,7 @@ function($timeout, $controller, $ionicBind) {
var scrollViewOptions= {
el: $element[0],
delegateHandle: $attr.delegateHandle,
bouncing: $scope.$eval($attr.hasBouncing),
paging: isPaging,
scrollbarX: $scope.$eval($scope.scrollbarX) !== false,
scrollbarY: $scope.$eval($scope.scrollbarY) !== false,

5
test/unit/angular/directive/scroll.unit.js
View File

@@ -20,6 +20,11 @@ describe('Ionic Scroll Directive', function() {
.toBe('handleThis');
});
it('passes hasBouncing attribute', function() {
var el = compile('<ion-scroll has-bouncing="123">')(scope);
expect(el.controller('$ionicScroll')._scrollViewOptions.bouncing).toEqual(123);
});
it('has $onScroll (used by $ionicScrollController)', function() {
element = compile('<ion-scroll on-scroll="foo()"></ion-scroll>')(scope);
scope = element.scope();