[incubator-weex-site] branch master updated: * [Android] Make flex-direction of scroller to column, which meets the fact of the current code. (#247)

[ky...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 629b28a  * [Android] Make flex-direction of scroller to column, which meets the fact of the current code. (#247)
629b28a is described below

commit 629b28a65293ce5618e958ceb91680cd462295d1
Author: YorkShen <sh...@gmail.com>
AuthorDate: Tue Dec 18 20:25:35 2018 +0800

    * [Android] Make flex-direction of scroller to column, which meets the fact of the current code. (#247)
---
 source/cn/references/components/scroller.md | 2 +-
 source/references/components/scroller.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/cn/references/components/scroller.md b/source/cn/references/components/scroller.md
index 7ddc9b1..80a9056 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 64371d5..fbfc26d 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: &lt;boolean&gt;  true | false, default value is true. This attribute indicates whether show the scroll bar or not.
 * scroll-direction: &lt;string&gt;  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 : &lt;number&gt; 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.