javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-21 13:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4983 from mallowigi/patch-1

Browse Source 
docs(scroll): fix doc about scrollX and scrollY attributes
This commit is contained in:
Adam Bradley
2016-01-19 09:33:41 -06:00
parent 8f293baf7e 039940d4b7
commit 452acd1c7e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ionic/components/scroll/scroll.ts
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. * 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 * @usage
* ```html * ```html
* <ion-scroll scroll-x="true"> * <ion-scroll scrollX="true">
* </ion-scroll> * </ion-scroll>
* *
* <ion-scroll scroll-y="true"> * <ion-scroll scrollY="true">
* </ion-scroll> * </ion-scroll>
* *
* <ion-scroll scroll-x="true" scroll-y="true"> * <ion-scroll scrollX="true" scrollY="true">
* </ion-scroll> * </ion-scroll>
* ``` * ```
*@property {boolean} [scroll-x] - whether to enable scrolling along the X axis *@property {boolean} [scrollX] - whether to enable scrolling along the X axis
*@property {boolean} [scroll-y] - whether to enable scrolling along the Y axis *@property {boolean} [scrollY] - whether to enable scrolling along the Y axis
*@property {boolean} [zoom] - whether to enable zooming *@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/ * @demo /docs/v2/demos/scroll/
*/ */
@Component({ @Component({