[GitHub] YorkShen closed pull request #247: * [Doc] Make flex-direction of scroller to column

[GitBox <gi...@apache.org>]

YorkShen closed pull request #247: * [Doc] Make flex-direction of scroller to column
URL: https://github.com/apache/incubator-weex-site/pull/247
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/source/cn/references/components/scroller.md b/source/cn/references/components/scroller.md
index 7ddc9b1d9..80a9056d6 100644
--- a/source/cn/references/components/scroller.md
+++ b/source/cn/references/components/scroller.md
@@ -36,7 +36,7 @@ version: 2.1
 
 - `scroll-direction {string}`：可选为 `horizontal` 或者 `vertical`，默认值为 `vertical` 。定义滚动的方向。
   - `scroll-direction`定义了 scroller 的滚动方向，样式表属性 `flex-direction` 定义了 scroller 的布局方向，两个方向必须一致。
-  - `scroll-direction` 的默认值是 `vertical`, `flex-direction` 的默认值是 `row`。
+  - `scroll-direction` 的默认值是 `vertical`, `flex-direction` 的默认值是 `column`。
   - 当需要一个水平方向的 scroller 时，使用 `scroll-direction:horizontal` 和 `flex-direction: row`。
   - 当需要一个竖直方向的 scroller 时，使用 `scroll-direction:vertical` 和 `flex-direction: column`。由于这两个值均是默认值，当需要一个竖直方向的 scroller 时，这两个值可以不设置。
 - `loadmoreoffset {number}`：默认值为 0，触发 `loadmore` 事件所需要的垂直偏移距离（设备屏幕底部与页面底部之间的距离）。当页面的滚动条滚动到足够接近页面底部时将会触发 `loadmore` 这个事件。
diff --git a/source/references/components/scroller.md b/source/references/components/scroller.md
index 64371d519..fbfc26d79 100644
--- a/source/references/components/scroller.md
+++ b/source/references/components/scroller.md
@@ -28,7 +28,7 @@ There are two special components that can only be used inside scroller component
 * show-scrollbar: <boolean>  true | false, default value is true. This attribute indicates whether show the scroll bar or not.
 * scroll-direction: <string>  the scroll direction of component, horizontal or vertical.
   * `scroll-direction` defines the scrollable axis of scroller and `flex-direction` defines the layout axis of scroller. `scroll-direction` and `flex-direction` must be set to the same direction, otherwise, undefined behavior may happen.
-  * Default value for `scroll-direction` is vertical, and for `flex-direction` is row .
+  * Default value for `scroll-direction` is `vertical`, and for `flex-direction` is `column` .
   * Use `scroll-direction:horizontal` and `flex-direction: row` when a horizontal layout and scrollable scroller is expected.
   * Use `scroll-direction:vertical` and `flex-direction: column` when a vertical layout and scrollable scroller is expected. But those two values are default, if you don't set them, it also works fine.
 * loadmoreoffset : <number> default value is 0. The loadmore event will be triggered when the list is loadmoreoffset left to reach the bottom. e.g. A list has total content length of 1000, and the loadmoreoffset is set to 400, the loadmore event will be triggered when 600 has beed scrolled and there is less than 400 left.


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services