diff --git a/js/angular/directive/scroll.js b/js/angular/directive/scroll.js index b5fbb07148a..88c1150295e 100644 --- a/js/angular/directive/scroll.js +++ b/js/angular/directive/scroll.js @@ -8,7 +8,7 @@ * * @description * Creates a scrollable container for all content inside. - * + * * @usage * * Basic usage: @@ -18,15 +18,16 @@ *
* * ``` - * + * * Note that it's important to set the height of the scroll box as well as the height of the inner * content to enable scrolling. This makes it possible to have full control over scrollable areas. - * + * * If you'd just like to have a center content scrolling area, use {@link ionic.directive:ionContent} instead. * * @param {string=} delegate-handle The handle used to identify this scrollView * with {@link ionic.service:$ionicScrollDelegate}. * @param {string=} direction Which way to scroll. 'x' or 'y' or 'xy'. Default 'y'. + * @param {boolean=} locking Whether to lock scrolling in one direction at a time. Useful to set to false when zoomed in or scrolling in two directions. Default true. * @param {boolean=} paging Whether to scroll with paging. * @param {expression=} on-refresh Called on pull-to-refresh, triggered by an {@link ionic.directive:ionRefresher}. * @param {expression=} on-scroll Called whenever the user scrolls. @@ -88,6 +89,7 @@ function($timeout, $controller, $ionicBind) { var scrollViewOptions= { el: $element[0], delegateHandle: $attr.delegateHandle, + locking: ($attr.locking || 'true') === 'true', bouncing: $scope.$eval($attr.hasBouncing), paging: isPaging, scrollbarX: $scope.$eval($scope.scrollbarX) !== false,