Merge pull request #4983 from mallowigi/patch-1

docs(scroll): fix doc about scrollX and scrollY attributes
This commit is contained in:
Adam Bradley
2016-01-19 09:33:41 -06:00

View File

@ -13,19 +13,19 @@ import * as util from '../../util';
* Scroll is a non-flexboxed scroll area that can scroll horizontally or vertically. `ion-Scroll` Can be used in places were you may not need a full page scroller, but a highly customized one, such as image scubber or comment scroller.
* @usage
* ```html
* <ion-scroll scroll-x="true">
* <ion-scroll scrollX="true">
* </ion-scroll>
*
* <ion-scroll scroll-y="true">
* <ion-scroll scrollY="true">
* </ion-scroll>
*
* <ion-scroll scroll-x="true" scroll-y="true">
* <ion-scroll scrollX="true" scrollY="true">
* </ion-scroll>
* ```
*@property {boolean} [scroll-x] - whether to enable scrolling along the X axis
*@property {boolean} [scroll-y] - whether to enable scrolling along the Y axis
*@property {boolean} [scrollX] - whether to enable scrolling along the X axis
*@property {boolean} [scrollY] - whether to enable scrolling along the Y axis
*@property {boolean} [zoom] - whether to enable zooming
*@property {number} [max-zoom] - set the max zoom amount for ion-scroll
*@property {number} [maxZoom] - set the max zoom amount for ion-scroll
* @demo /docs/v2/demos/scroll/
*/
@Component({