You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ha...@apache.org on 2018/03/26 11:21:14 UTC
[01/10] incubator-weex-site git commit: [WEEX-192][android]Weex
Document Waterfall Document Update
Repository: incubator-weex-site
Updated Branches:
refs/heads/master 9caa891f8 -> a192a5562
[WEEX-192][android]Weex Document Waterfall Document Update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/657c6c68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/657c6c68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/657c6c68
Branch: refs/heads/master
Commit: 657c6c68deaea79fdee3d200a476062da68b711f
Parents: 42138b4
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Mar 26 11:37:59 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Mar 26 11:37:59 2018 +0800
----------------------------------------------------------------------
source/cn/references/components/waterfall.md | 4 +++-
source/references/components/waterfall.md | 10 ++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/657c6c68/source/cn/references/components/waterfall.md
----------------------------------------------------------------------
diff --git a/source/cn/references/components/waterfall.md b/source/cn/references/components/waterfall.md
index 643efb5..83dda6e 100644
--- a/source/cn/references/components/waterfall.md
+++ b/source/cn/references/components/waterfall.md
@@ -28,6 +28,8 @@ version: 2.1
- `auto`: 意味着列数是被其他属性所决定的(比如 column-width)
- `<integer>`: 最佳列数，column-width 和 column-count 都指定非0值， 则 column-count 代表最大列数。
- **column-gap**: 列与列的间隙. 如果指定了 `normal` ，则对应 `32`.
+- **left-gap**: 左边cell和列表的间隙. 如果未指定 ，则对应 `0`<span class="api-version">v0.19+</span>.
+- **column-gap**: 右边cell和列表的间隙. 如果未指定，则对应 `0`<span class="api-version">v0.19+</span>.
其他支持的属性参见 [List Component Attributes](./list.html)
@@ -62,4 +64,4 @@ version: 2.1
### 示例
-参见 [playground waterfall example](http://dotwe.org/vue/7a9195643e9e8da352b0d879cdbe68c0)
+[waterfall example](http://dotwe.org/vue/7a9195643e9e8da352b0d879cdbe68c0)
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/657c6c68/source/references/components/waterfall.md
----------------------------------------------------------------------
diff --git a/source/references/components/waterfall.md b/source/references/components/waterfall.md
index dea3742..9ce8942 100644
--- a/source/references/components/waterfall.md
+++ b/source/references/components/waterfall.md
@@ -10,11 +10,11 @@ version: 2.1
<span class="weex-version">v0.11.0+</span>
-A component providing waterfall layout.
+A component providing waterfall layout over list component.
### Child Components
-Notes: The waterfall now supports the following child components: cell, header, refresh, loading and fixed-position components. Other kinds of components will not be guaranteed to be displayed correctly.
+Notes: The waterfall only supports the following child components: cell, header, refresh, loading and fixed-position components. Other kinds of components will not be guaranteed to be displayed correctly.
* cell: presents the content for a single data item in waterfall
* header: components that need to stretch across multiple columns. It can be sticky by using css position.
@@ -28,8 +28,10 @@ Notes: The waterfall now supports the following child components: cell, header,
* `auto`: means that the number of columns will be determined by other properties (e.g., column-width, if it has a non-auto value).
* `<integer>`: describes the optimal number of columns into which the content of the element will be flowed. Values must be greater than 0. If both column-width and column-count have non-auto values, the integer value describes the maximum number of columns.
* **column-gap**:sets the gap between columns. if `normal` is specified, the gap will be `32`.
+* **left-gap**:sets the gap between left edge and left cell. if `none` is specified, the gap will be `0`<span class="api-version">v0.19+</span>.
+* **right-gap**:sets the gap between right edge and right most cell. if `none` is specified, the gap will be `0`<span class="api-version">v0.19+</span>.
-To see other attributes, please checkout [List Component Attributes](./list.html)
+To see other attributes in list, please checkout [List Component Attributes](./list.html)
### Styles
@@ -53,4 +55,4 @@ All subcomponents in waterfall support the scrollToElement API in [dom module](.
### Example
-see [playground waterfall example](http://dotwe.org/vue/7a9195643e9e8da352b0d879cdbe68c0)
+[waterfall example](http://dotwe.org/vue/7a9195643e9e8da352b0d879cdbe68c0)
[09/10] incubator-weex-site git commit: [android]Weex Document Meta
Document Update (#124)
Posted by ha...@apache.org.
[android]Weex Document Meta Document Update (#124)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/1a6bb3f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/1a6bb3f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/1a6bb3f0
Branch: refs/heads/master
Commit: 1a6bb3f047d698c0395899c3d0c564ce73fbec7d
Parents: 55f8aef ef5aa8e
Author: Hanks <zh...@gmail.com>
Authored: Mon Mar 26 19:20:06 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Mon Mar 26 19:20:06 2018 +0800
----------------------------------------------------------------------
source/cn/references/modules/meta.md | 2 +-
source/references/modules/meta.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/1a6bb3f0/source/cn/references/modules/meta.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/1a6bb3f0/source/references/modules/meta.md
----------------------------------------------------------------------
[06/10] incubator-weex-site git commit: update
Posted by ha...@apache.org.
update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/4ac5cafa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/4ac5cafa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/4ac5cafa
Branch: refs/heads/master
Commit: 4ac5cafa15d3c76c8859a46803b7b14048e06336
Parents: f1ddc1e
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Mar 26 18:03:13 2018 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Mar 26 18:03:13 2018 +0800
----------------------------------------------------------------------
source/cn/wiki/event-bubble.md | 6 +++---
source/wiki/event-bubble.md | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4ac5cafa/source/cn/wiki/event-bubble.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/event-bubble.md b/source/cn/wiki/event-bubble.md
index f44748a..cfdd6d3 100644
--- a/source/cn/wiki/event-bubble.md
+++ b/source/cn/wiki/event-bubble.md
@@ -50,7 +50,7 @@ Weex 在 0.13 版本 SDK 里实现了事件冒泡机制。注意事件冒泡默
```javascript
{
handleClick (event) {
- // stop event propagation.
+ // 阻止继续冒泡.
event.stopPropagation()
}
}
@@ -62,6 +62,6 @@ Weex 在 0.13 版本 SDK 里实现了事件冒泡机制。注意事件冒泡默
## 实例
-[开启事件冒泡](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95)：使用 Weex playground App 扫描页面里的二维码，然后在打开页面中点击包含 'click me' 文字的方框，会看到事件冒泡效果，即外层的组件依次显示事件成功冒泡到当前组件的提示。
+- [开启事件冒泡](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95)：使用 Weex playground App 扫描页面里的二维码，然后在打开页面中点击包含 'click me' 文字的方框，会看到事件冒泡效果，即外层的组件依次显示事件成功冒泡到当前组件的提示。
-[阻止冒泡](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69)：使用 Weex playground App 扫描页面里的二维码，然后在打开页面中点击包含 'click me' 文字的方框，可以看到事件冒泡被父组件中断了，不再冒泡到最外层组件。
+- [阻止冒泡](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69)：使用 Weex playground App 扫描页面里的二维码，然后在打开页面中点击包含 'click me' 文字的方框，可以看到事件冒泡被父组件中断了，不再冒泡到最外层组件。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/4ac5cafa/source/wiki/event-bubble.md
----------------------------------------------------------------------
diff --git a/source/wiki/event-bubble.md b/source/wiki/event-bubble.md
index f470a7e..07b3034 100644
--- a/source/wiki/event-bubble.md
+++ b/source/wiki/event-bubble.md
@@ -50,7 +50,7 @@ In the event handler function, you can use the `event.stopPropagation()` method
```javascript
{
handleClick (event) {
- // stop event propagation.
+ // Stop event propagation.
event.stopPropagation()
}
}
@@ -62,6 +62,6 @@ One thing should be noticed: **For compatibility reason, Weex does not turn on e
## Examples
-[enable event bubbling](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95): Use Weex playground APP to scan the qr-code, and then click on the middle of the rectangle with a line of text 'click me' on, you can see the event bubbling up, being handled with every listener binding on each div element, printing messages which indicate that they are indeed been reached by the event.
+- [enable event bubbling](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95): Use Weex playground APP to scan the qr-code, and then click on the middle of the rectangle with a line of text 'click me' on, you can see the event bubbling up, being handled with every listener binding on each div element, printing messages which indicate that they are indeed been reached by the event.
-[stop event propagation](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69): Use Weex playground APP to scan the qr-code, and then click on the middle of the rectangle with a line of text 'click me' on, you can see the event bubbling is disturbed, no longer continue to spread to the root element.
+- [stop event propagation](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69): Use Weex playground APP to scan the qr-code, and then click on the middle of the rectangle with a line of text 'click me' on, you can see the event bubbling is disturbed, no longer continue to spread to the root element.
[02/10] incubator-weex-site git commit: Merge branch 'master' into
weex_document_waterfall
Posted by ha...@apache.org.
Merge branch 'master' into weex_document_waterfall
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/9de3ac6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/9de3ac6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/9de3ac6f
Branch: refs/heads/master
Commit: 9de3ac6fffd342011a2d23262f4922e53253b12b
Parents: 657c6c6 38839e7
Author: codefurture <gu...@163.com>
Authored: Mon Mar 26 11:40:29 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Mar 26 11:40:29 2018 +0800
----------------------------------------------------------------------
README.md | 9 +-
_config.yml | 133 +-
_config_cn.yml | 132 +-
_drafts/difference-with-web.en.md | 4 +-
_drafts/extend-js-framework.md | 168 +
_drafts/extend-to-android.md | 175 +
_drafts/sandbox.md | 36 +
_drafts/using-vue.md | 59 +
advanced/extend-to-android.md | 175 -
package-lock.json | 5330 +++++++++++++++---
package.json | 23 +-
source/_data/users.yml | 155 +
source/bug-report-guidelines.md | 66 +
source/cn/bug-report-guidelines.md | 59 +
source/cn/contributing.md | 103 +-
source/cn/development-process.md | 94 +
source/cn/download.ejs | 3 +
source/cn/guide/advanced/app-architecture.md | 8 +-
source/cn/guide/advanced/downgrade.md | 2 +-
source/cn/guide/advanced/page-architecture.md | 18 +-
source/cn/guide/advanced/path.md | 2 +-
.../guide/advanced/use-vuex-and-vue-router.md | 8 +-
source/cn/guide/extend-android.md | 144 +-
source/cn/guide/extend-ios.md | 441 +-
source/cn/guide/extend-js-framework.md | 6 +-
source/cn/guide/extend-module-using-swift.md | 110 +
source/cn/guide/extend-web-render.md | 37 +-
source/cn/guide/front-end-frameworks.md | 23 +-
source/cn/guide/index.md | 190 +-
source/cn/guide/integrate-devtool-to-android.md | 9 +-
source/cn/guide/integrate-devtool-to-ios.md | 2 +-
source/cn/guide/integrate-to-your-app.md | 84 +-
source/cn/guide/set-up-env.md | 2 +-
source/cn/guide/use-vue.md | 265 +
source/cn/guide/using-rax.md | 7 -
source/cn/guide/using-vue.md | 63 -
source/cn/references/broadcast-channel.md | 113 +
source/cn/references/components/a.md | 88 +-
source/cn/references/components/cell.md | 68 +-
source/cn/references/components/div.md | 6 +-
source/cn/references/components/image.md | 245 +-
source/cn/references/components/index.md | 25 +
source/cn/references/components/indicator.md | 95 +-
source/cn/references/components/input.md | 31 +-
source/cn/references/components/list.md | 70 +-
source/cn/references/components/loading.md | 174 +-
source/cn/references/components/recycle-list.md | 256 +
source/cn/references/components/refresh.md | 184 +-
source/cn/references/components/scroller.md | 10 +-
source/cn/references/components/slider.md | 13 +-
source/cn/references/components/switch.md | 149 +-
source/cn/references/components/text.md | 134 +-
source/cn/references/components/textarea.md | 16 +-
source/cn/references/components/video.md | 4 +-
source/cn/references/components/waterfall.md | 6 +-
source/cn/references/components/web.md | 190 +-
source/cn/references/images/style_1.jpg | Bin 59366 -> 0 bytes
source/cn/references/images/style_2.jpg | Bin 59696 -> 0 bytes
source/cn/references/index.md | 8 +
source/cn/references/js-framework-apis.md | 67 -
source/cn/references/modules/animation.md | 132 +-
source/cn/references/modules/clipboard.md | 4 +-
source/cn/references/modules/dom.md | 255 +-
source/cn/references/modules/globalevent.md | 23 +-
source/cn/references/modules/index.md | 20 +
source/cn/references/modules/meta.md | 2 +-
source/cn/references/modules/modal.md | 133 +-
source/cn/references/modules/navigator.md | 4 +-
source/cn/references/modules/picker.md | 11 +-
source/cn/references/modules/storage.md | 1 -
source/cn/references/modules/stream.md | 75 +-
source/cn/references/modules/websocket.md | 12 +-
source/cn/references/modules/webview.md | 159 +-
source/cn/references/weex-variable.md | 147 +-
source/cn/releasenote.md | 283 +-
source/cn/resources.md | 41 +
source/cn/tools/download.ejs | 3 -
source/cn/tools/helpers.md | 2 +-
source/cn/tools/index.md | 4 +-
source/cn/tools/market.md | 6 -
source/cn/tools/toolkit.md | 259 +-
source/cn/who-is-using-weex.md | 1 +
source/cn/wiki/color-names.md | 4 +-
source/cn/wiki/common-events.md | 2 +-
source/cn/wiki/common-styles.md | 2 +-
source/cn/wiki/component-introduction.md | 29 +
source/cn/wiki/css-units.md | 4 +-
source/cn/wiki/design-principles.md | 2 +
source/cn/wiki/event-bubble.md | 4 +-
source/cn/wiki/faq.md | 9 +-
source/cn/wiki/gestures.md | 9 +-
source/cn/wiki/handler-introduction.md | 51 +
source/cn/wiki/images/css-boxmodel.png | Bin 0 -> 12581 bytes
source/cn/wiki/images/css-flexbox-align.jpg | Bin 0 -> 35005 bytes
source/cn/wiki/images/css-flexbox-justify.svg | 59 +
source/cn/wiki/images/css-flexbox-sample.png | Bin 0 -> 3210 bytes
source/cn/wiki/images/nav.png | Bin 0 -> 83497 bytes
source/cn/wiki/images/style_1.jpg | Bin 0 -> 59366 bytes
source/cn/wiki/images/style_2.jpg | Bin 0 -> 59696 bytes
source/cn/wiki/index.md | 12 +-
source/cn/wiki/module-introduction.md | 32 +
source/cn/wiki/platform-difference.md | 12 +-
source/cn/wiki/text-styles.md | 4 +-
source/contributing.md | 99 +-
source/development-process.md | 95 +
source/download.ejs | 3 +
source/guide/advanced/app-architecture.md | 8 +-
source/guide/advanced/downgrade.md | 2 +-
source/guide/advanced/page-architecture.md | 2 +-
source/guide/advanced/path.md | 4 +-
.../guide/advanced/use-vuex-and-vue-router.md | 20 +-
source/guide/create-a-plugin.md | 133 +
source/guide/extend-android.md | 259 +-
source/guide/extend-ios.md | 474 +-
source/guide/extend-js-framework.md | 4 +-
source/guide/extend-module-using-swift.md | 114 +
source/guide/extend-web-render.md | 49 +-
source/guide/front-end-frameworks.md | 27 +-
source/guide/images/different-switch.png | Bin 0 -> 29228 bytes
source/guide/images/toolkit-preview.png | Bin 0 -> 180414 bytes
source/guide/index.md | 128 +-
source/guide/integrate-devtool-to-android.md | 9 +-
source/guide/integrate-devtool-to-ios.md | 2 +
source/guide/integrate-to-your-app.md | 109 +-
source/guide/set-up-env.md | 90 +-
source/guide/use-vue.md | 268 +
source/guide/using-rax.md | 7 -
source/guide/using-vue.md | 59 -
source/references/broadcast-channel.md | 113 +
source/references/components/a.md | 74 +-
source/references/components/cell.md | 14 +-
source/references/components/div.md | 12 +-
source/references/components/image.md | 221 +-
source/references/components/index.md | 25 +
source/references/components/indicator.md | 97 +-
source/references/components/input.md | 73 +-
source/references/components/list.md | 123 +-
source/references/components/loading.md | 106 +
source/references/components/recycle-list.md | 9 +
source/references/components/refresh.md | 254 +-
source/references/components/scroller.md | 34 +-
source/references/components/slider.md | 17 +-
source/references/components/switch.md | 143 +-
source/references/components/text.md | 114 +-
source/references/components/textarea.md | 16 +-
source/references/components/video.md | 4 +-
source/references/components/waterfall.md | 10 +-
source/references/components/web.md | 183 +-
source/references/images/BroadcastChannel.png | Bin 0 -> 50463 bytes
.../references/images/image-resize-property.png | Bin 0 -> 730054 bytes
source/references/index.md | 18 +-
source/references/js_framework-apis.md | 67 -
source/references/modules/animation.md | 136 +-
source/references/modules/clipboard.md | 2 +-
source/references/modules/dom.md | 258 +-
source/references/modules/globalevent.md | 21 +-
source/references/modules/index.md | 20 +
source/references/modules/meta.md | 2 +-
source/references/modules/modal.md | 125 +-
source/references/modules/navigator.md | 83 +-
source/references/modules/picker.md | 11 +-
source/references/modules/storage.md | 16 +-
source/references/modules/stream.md | 72 +-
source/references/modules/websocket.md | 12 +-
source/references/modules/webview.md | 139 +-
source/references/weex-variable.md | 151 +-
source/releasenote.md | 285 +-
source/resources.md | 41 +
source/tools/download.ejs | 3 -
source/tools/helpers.md | 4 +-
source/tools/index.md | 6 +-
source/tools/market.md | 6 -
source/tools/toolkit.md | 234 +-
source/who-is-using-weex.md | 1 +
source/wiki/color-names.md | 2 +-
source/wiki/common-events.md | 2 +-
source/wiki/common-styles.md | 6 +-
source/wiki/component-introduction.md | 29 +
source/wiki/css-units.md | 2 +-
source/wiki/design-principles.md | 2 +
source/wiki/event-bubble.md | 2 +
source/wiki/faq.md | 11 +-
source/wiki/gestures.md | 9 +-
source/wiki/handler-introduction.md | 55 +
source/wiki/images/css-boxmodel.png | Bin 0 -> 12581 bytes
source/wiki/images/css-flexbox-align.jpg | Bin 0 -> 35005 bytes
source/wiki/images/css-flexbox-justify.svg | 59 +
source/wiki/images/css-flexbox-sample.png | Bin 0 -> 3210 bytes
source/wiki/images/nav.png | Bin 0 -> 83497 bytes
source/wiki/index.md | 16 +-
source/wiki/module-introduction.md | 34 +
source/wiki/text-styles.md | 4 +-
test/url-validator.js | 98 +
themes/weex/languages/cn.yml | 12 +-
themes/weex/languages/en.yml | 11 +-
themes/weex/layout/_partial/article.ejs | 4 +-
themes/weex/layout/_partial/header.ejs | 42 +-
themes/weex/layout/_partial/post/summary.ejs | 21 +-
themes/weex/layout/_partial/slider.ejs | 2 +-
themes/weex/layout/index.ejs | 246 +-
themes/weex/layout/playground.ejs | 6 +-
themes/weex/layout/post.ejs | 8 +-
themes/weex/layout/who-is-using-weex.ejs | 31 +
themes/weex/scripts/helper.js | 6 +-
themes/weex/source/css/common.scss | 2 +-
themes/weex/source/css/index.scss | 216 +-
themes/weex/source/css/media-queries.scss | 74 +-
themes/weex/source/css/partial/article.scss | 52 +-
themes/weex/source/css/partial/highlight.scss | 4 +-
themes/weex/source/css/partial/summary.scss | 3 +
themes/weex/source/css/playground.scss | 33 +-
themes/weex/source/css/post.scss | 11 +-
themes/weex/source/css/variable.scss | 2 +-
themes/weex/source/images/android-icon.png | Bin 0 -> 1043 bytes
themes/weex/source/images/ios-icon.png | Bin 0 -> 1323 bytes
themes/weex/source/images/users-add.png | Bin 0 -> 181 bytes
themes/weex/source/js/common.js | 73 +-
217 files changed, 12005 insertions(+), 6414 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/9de3ac6f/source/cn/references/components/waterfall.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/9de3ac6f/source/references/components/waterfall.md
----------------------------------------------------------------------
[08/10] incubator-weex-site git commit: [android]Weex Document
Waterfall Document Update (#123)
Posted by ha...@apache.org.
[android]Weex Document Waterfall Document Update (#123)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/55f8aef4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/55f8aef4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/55f8aef4
Branch: refs/heads/master
Commit: 55f8aef46b192d9bef8d73540f400b7e0f7dc6fe
Parents: 9caa891 9de3ac6
Author: Hanks <zh...@gmail.com>
Authored: Mon Mar 26 19:19:24 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Mon Mar 26 19:19:24 2018 +0800
----------------------------------------------------------------------
source/cn/references/components/waterfall.md | 4 +++-
source/references/components/waterfall.md | 10 ++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[03/10] incubator-weex-site git commit: [WEEX-192][android]Weex
Document Meta Document Update
Posted by ha...@apache.org.
[WEEX-192][android]Weex Document Meta Document Update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/9df799ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/9df799ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/9df799ae
Branch: refs/heads/master
Commit: 9df799ae0fe64c05894b3c562d4cd582d1888f75
Parents: 42138b4
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Mar 26 11:46:02 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Mar 26 11:46:02 2018 +0800
----------------------------------------------------------------------
source/cn/references/modules/meta.md | 2 +-
source/references/modules/meta.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/9df799ae/source/cn/references/modules/meta.md
----------------------------------------------------------------------
diff --git a/source/cn/references/modules/meta.md b/source/cn/references/modules/meta.md
index 95c1400..ebe061c 100644
--- a/source/cn/references/modules/meta.md
+++ b/source/cn/references/modules/meta.md
@@ -8,7 +8,7 @@ version: 2.1
# meta
-meta 模块可用于声明单个页面的元信息，通常是一些页面的配置，如容器的显示宽度 (viewport) 等。
+meta 模块可用于声明单个页面的元信息，通常是一些页面级别的配置，如容器的显示宽度 (viewport) 等。
## API
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/9df799ae/source/references/modules/meta.md
----------------------------------------------------------------------
diff --git a/source/references/modules/meta.md b/source/references/modules/meta.md
index ebb60a6..873f546 100644
--- a/source/references/modules/meta.md
+++ b/source/references/modules/meta.md
@@ -8,7 +8,7 @@ version: 2.1
# meta
-The meta module can be used to declare meta information for a single page, such as the viewport of the container.
+The meta module can be used to update meta information for a single page, such as the viewport of the container.
## API
[10/10] incubator-weex-site git commit: Rewrite doc about event
bubble (#125)
Posted by ha...@apache.org.
Rewrite doc about event bubble (#125)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/a192a556
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/a192a556
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/a192a556
Branch: refs/heads/master
Commit: a192a55628762f11a9083a40e304968b46ec0864
Parents: 1a6bb3f 85e68eb
Author: Hanks <zh...@gmail.com>
Authored: Mon Mar 26 19:20:55 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Mon Mar 26 19:20:55 2018 +0800
----------------------------------------------------------------------
source/cn/wiki/event-bubble.md | 148 ++++++++----------------------------
source/wiki/event-bubble.md | 148 ++++++++----------------------------
2 files changed, 66 insertions(+), 230 deletions(-)
----------------------------------------------------------------------
[04/10] incubator-weex-site git commit: [WEEX-192][android]Weex
Document Meta Document Update
Posted by ha...@apache.org.
[WEEX-192][android]Weex Document Meta Document Update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/ef5aa8ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/ef5aa8ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/ef5aa8ef
Branch: refs/heads/master
Commit: ef5aa8efb7d7585ef34a3707c754e7134fc44638
Parents: 9df799a
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Mar 26 11:47:58 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Mar 26 11:47:58 2018 +0800
----------------------------------------------------------------------
source/cn/references/modules/meta.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/ef5aa8ef/source/cn/references/modules/meta.md
----------------------------------------------------------------------
diff --git a/source/cn/references/modules/meta.md b/source/cn/references/modules/meta.md
index ebe061c..d2cbb97 100644
--- a/source/cn/references/modules/meta.md
+++ b/source/cn/references/modules/meta.md
@@ -8,7 +8,7 @@ version: 2.1
# meta
-meta 模块可用于声明单个页面的元信息，通常是一些页面级别的配置，如容器的显示宽度 (viewport) 等。
+meta 模块可用于声明单个页面的元信息，通常是一些页面级别的配置，如容器的显示宽度 (viewport) 等。默认情况下，应用无需修改此配置。
## API
[07/10] incubator-weex-site git commit: update
Posted by ha...@apache.org.
update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/85e68ebf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/85e68ebf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/85e68ebf
Branch: refs/heads/master
Commit: 85e68ebf862c15a4854d2c51f4a757ebe6114351
Parents: 4ac5caf
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Mar 26 18:05:46 2018 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Mar 26 18:05:46 2018 +0800
----------------------------------------------------------------------
source/cn/wiki/event-bubble.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/85e68ebf/source/cn/wiki/event-bubble.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/event-bubble.md b/source/cn/wiki/event-bubble.md
index cfdd6d3..f926d62 100644
--- a/source/cn/wiki/event-bubble.md
+++ b/source/cn/wiki/event-bubble.md
@@ -10,7 +10,7 @@ version: 2.1
<span class="api-version">v0.13+</span>
-> **Note:** 目前仅 Weex Native（Android 和 iOS）支持，[web 端](https://github.com/weexteam/weex-vue-render) 暂时不支持此项特性.
+> **注意:** 目前仅 Weex Native（Android 和 iOS）支持，[web 端](https://github.com/weexteam/weex-vue-render) 暂时不支持此项特性.
如果你是个 web 开发者，你大概对浏览器事件冒泡机制已经很熟悉了，而且可能认为 Weex 默认会支持事件冒泡。然而，Weex 在 0.13 之前是不支持这一特性的，在 0.13 版本，Weex 提供了这项支持。
[05/10] incubator-weex-site git commit: update event bubbling intro.
Posted by ha...@apache.org.
update event bubbling intro.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/f1ddc1ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/f1ddc1ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/f1ddc1ec
Branch: refs/heads/master
Commit: f1ddc1ec789abff90bc34438623a63bc53212dd3
Parents: 38839e7
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Mar 26 17:57:16 2018 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Mar 26 17:57:16 2018 +0800
----------------------------------------------------------------------
source/cn/wiki/event-bubble.md | 148 ++++++++----------------------------
source/wiki/event-bubble.md | 148 ++++++++----------------------------
2 files changed, 66 insertions(+), 230 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/f1ddc1ec/source/cn/wiki/event-bubble.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/event-bubble.md b/source/cn/wiki/event-bubble.md
index 964eab5..f44748a 100644
--- a/source/cn/wiki/event-bubble.md
+++ b/source/cn/wiki/event-bubble.md
@@ -8,142 +8,60 @@ version: 2.1
<!-- toc -->
-> 仅在 <span class="api-version">v0.13</span> 及以上版本中支持。
+<span class="api-version">v0.13+</span>
-Weex 2.0 实现了 W3C 标准的事件冒泡机制。
+> **Note:** 目前仅 Weex Native（Android 和 iOS）支持，[web 端](https://github.com/weexteam/weex-vue-render) 暂时不支持此项特性.
-### 使用
+如果你是个 web 开发者，你大概对浏览器事件冒泡机制已经很熟悉了，而且可能认为 Weex 默认会支持事件冒泡。然而，Weex 在 0.13 之前是不支持这一特性的，在 0.13 版本，Weex 提供了这项支持。
-```html
-<template>
- <div class="root" @click="rootClick" bubble="true">
- <text style="font-size: 40px;">{{rootText}}</text>
- <div class="outer" @click="parentClick">
- <div>
- <text style="font-size: 40px;">{{parentText}}</text>
- </div>
- <text class="inner" @click="click">{{innerText}}</text>
- </div>
- </div>
-</template>
+对于不熟悉事件冒泡的开发者，这里简要介绍一下浏览器事件冒泡机制的概念：
-<script>
- module.exports = {
- data: {
- innerText: 'click me',
- parentText: '',
- rootText: ''
- },
- methods: {
- click: function(e) {
- this.innerText = 'inner bubble'
- },
- parentClick: function(e) {
- this.parentText = 'parent bubble'
- },
- rootClick: function(e) {
- this.rootText = 'root bubble'
- }
- }
- }
-</script>
-
-<style scoped>
- .inner {
- font-size: 40px;
- text-align: center;
- background-color: #7a9b1b;
- padding: 40px;
- }
+## 概念
- .outer {
- font-size: 40px;
- text-align: center;
- background-color: #9b7a1b;
- padding: 120px;
- }
+以点击事件为例，比如一个点击事件发生在某个 `<video>` 元素上，这个元素有一个父元素（比如是个 `div` 元素），浏览器会执行两个处理阶段 - 捕获（capturing）阶段和冒泡（bubbling）阶段。在 web 开发中冒泡阶段会用的比较多，而捕获处理用的比较少。
- .root {
- font-size: 40px;
- text-align: center;
- background-color: #7a1b9b;
- padding: 80px;
- }
-</style>
-```
+在捕获阶段，浏览器检查当前元素的最外层父节点（在 web 上，比如，`<html>` 元素），如果它上面绑定了一个 click 事件处理器，那么先执行这个处理器。然后检查下一个元素，`<html>` 的子元素里是 `<video>` 祖先元素的那个元素，做同样的检测。一步步直到遇到当前点击的这个元素本身。
-[try it](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95)
+接下来是冒泡阶段，方向和捕获阶段相反：浏览器先检测当前被点击的元素上是否注册了点击事件处理器，如果有则执行它。接下来检测它的父元素，一步步向上，直到最外层 `<html>` 元素。
-运行以上代码，用客户端打开，点击中间的元素，可以看到事件向上传播，依次触发。
+
-### 注意
+我们一般使用默认的事件注册机制，将事件处理注册在冒泡阶段，所以处理冒泡阶段的情况比较多。当我们想要停止事件冒泡，只需要调用事件对象的 `stopPropagation` 方法。标准事件对象包含 `stopPropagation` 方法，当执行事件处理器时调用该方法，会立即停止事件冒泡，这样事件冒泡处理链上的后续处理器就不会再执行下去。
-需要注意的是: ** 为了兼容之前的版本，Weex 默认不会开启事件冒泡机制。需要在根元素的属性上，添加 `bubble="true"` 来开启冒泡机制。否则，将不会向上传播事件，保持与之前版本的效果相同。 **
+Weex 在 0.13 版本 SDK 里实现了事件冒泡机制。注意事件冒泡默认是不开启的，你需要在模板根元素上加上属性 `bubble=true` 才能开启冒泡。
-### stopPropagation
+## 使用
-在事件处理函数中，可以使用 `e.stopPropagation()` 方法，来阻止本次事件向上的传递过程。注意，`e.stopPropagation()` 与 `bubble="true"` 不同，前者只会影响当前元素以及父元素的传播，不会影响子元素的传播；后者是为了版本兼容而增加的开关机制，会全局关闭或者开启冒泡机制，两者可以共同存在使用，如下：
+事件冒泡默认不开启，需要手动添加 `bubble=true` 属性到根元素上。
```html
<template>
- <div class="root" @click="rootClick" bubble="true">
- <text style="font-size: 40px;">{{rootText}}</text>
- <div class="outer" @click="parentClick">
- <div>
- <text style="font-size: 40px;">{{parentText}}</text>
- </div>
- <text class="inner" @click="click">{{innerText}}</text>
- </div>
+ <!-- 开启事件冒泡机制. -->
+ <div bubble="true">
+ ...
</div>
</template>
+```
-<script>
- module.exports = {
- data: {
- innerText: 'click me',
- parentText: '',
- rootText: ''
- },
- methods: {
- click: function(e) {
- this.innerText = 'inner bubble'
- },
- parentClick: function(e) {
- this.parentText = 'parent bubble'
- e.stopPropagation()
- },
- rootClick: function(e) {
- this.rootText = 'root bubble'
- // e.stopPropagation()
- }
- }
- }
-</script>
-
-<style scoped>
- .inner {
- font-size: 40px;
- text-align: center;
- background-color: #7a9b1b;
- padding: 40px;
- }
+## 阻止冒泡
- .outer {
- font-size: 40px;
- text-align: center;
- background-color: #9b7a1b;
- padding: 120px;
- }
+在事件处理函数里，可以通过调用 `event.stopPropagation` 方法阻止事件冒泡。这个方法和 [DOM 标准](https://dom.spec.whatwg.org/#dom-event-stoppropagation)里的方法一致。注意 `event.stopPropagation` 和 `bubble=true` 的影响范围不同，前者仅针对当前冒泡到的元素以及其祖先层级有效，而对子元素无效。而后者相当于一个全局开关，开启以后对该根元素内部所有子元素都开启了事件冒泡效果。两者可以同时存在。
- .root {
- font-size: 40px;
- text-align: center;
- background-color: #7a1b9b;
- padding: 80px;
+```javascript
+{
+ handleClick (event) {
+ // stop event propagation.
+ event.stopPropagation()
}
-</style>
+}
```
-[try it](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69)
+## 注意
+
+需要注意的是: **为了兼容之前的版本，Weex 默认不会开启事件冒泡机制。需要在根元素的属性上，添加 `bubble="true"` 来开启冒泡机制。否则，将不会向上传播事件，保持与之前版本的效果相同。**
+
+## 实例
+
+[开启事件冒泡](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95)：使用 Weex playground App 扫描页面里的二维码，然后在打开页面中点击包含 'click me' 文字的方框，会看到事件冒泡效果，即外层的组件依次显示事件成功冒泡到当前组件的提示。
-运行以上代码，用客户端打开，点击中间的元素，可以看到事件向上传播到父元素被终止，不再继续往根元素传播。
+[阻止冒泡](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69)：使用 Weex playground App 扫描页面里的二维码，然后在打开页面中点击包含 'click me' 文字的方框，可以看到事件冒泡被父组件中断了，不再冒泡到最外层组件。
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/f1ddc1ec/source/wiki/event-bubble.md
----------------------------------------------------------------------
diff --git a/source/wiki/event-bubble.md b/source/wiki/event-bubble.md
index 261266a..f470a7e 100644
--- a/source/wiki/event-bubble.md
+++ b/source/wiki/event-bubble.md
@@ -8,142 +8,60 @@ version: 2.1
<!-- toc -->
-# Event Bubble <span class="api-version">v0.13+</span>
+<span class="api-version">v0.13+</span>
-Weex 2.0 implements the W3C standard event bubbling mechanism.
+> **Note:** This feature works only on weex's native platforms (i.e., on Android and iOS), but not on the web with latest [web renderer](https://github.com/weexteam/weex-vue-render) yet.
-### Usage
+If you are a web developer, then you are probably familiar with the event bubbling mechanism, and you may expect Weex to work the same way. However, Weex didn't implement this mechiansim util version 0.13.
-```html
-<template>
- <div class="root" @click="rootClick" bubble="true">
- <text style="font-size: 40px;">{{rootText}}</text>
- <div class="outer" @click="parentClick">
- <div>
- <text style="font-size: 40px;">{{parentText}}</text>
- </div>
- <text class="inner" @click="click">{{innerText}}</text>
- </div>
- </div>
-</template>
+To those developers who are not familiar with the event bubbling, Here are some explanations about it, and the concept is rather easy.
-<script>
- module.exports = {
- data: {
- innerText: 'click me',
- parentText: '',
- rootText: ''
- },
- methods: {
- click: function(e) {
- this.innerText = 'inner bubble'
- },
- parentClick: function(e) {
- this.parentText = 'parent bubble'
- },
- rootClick: function(e) {
- this.rootText = 'root bubble'
- }
- }
- }
-</script>
-
-<style scoped>
- .inner {
- font-size: 40px;
- text-align: center;
- background-color: #7a9b1b;
- padding: 40px;
- }
+## Concept
- .outer {
- font-size: 40px;
- text-align: center;
- background-color: #9b7a1b;
- padding: 120px;
- }
+Take clicking as a example. When a click event fired on a `<video>` element that has a parent element (e.g. a parent `div` component), web browsers run two different phases - the capturing phase and the bubbling phase. We use bubbling phase a lot in web development, and use capturing less.
- .root {
- font-size: 40px;
- text-align: center;
- background-color: #7a1b9b;
- padding: 80px;
- }
-</style>
-```
+In the capturing phase, The browser checks to see if the element's outer-most ancestor (on web, may be a `<html>`) has an corresponding event handler registered on it, and runs it if so. Then it moves on to the next element inside `<html>` and does the same thing, then the next one, and so on until it reaches the element that was actually clicked on.
-[try it](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95)
+In the bubbling phase, the exact opposite occurs: The browser checks to see if the element that was actually clicked on has an onclick event handler registered on it in the bubbling phase, and runs it if so. Then it moves on to the next immediate ancestor element and does the same thing, then the next one, and so on until it reaches the `<html>` element.
-Run the above code, open with the client, click on the middle of the elements, you can see the event spread up, followed by the trigger.
+
-### Notice
+We usually register our event listeners on the bubbling phase, so that we use bubbling a lot. But if you want to turn this off, you can use `stopPropagation` method of the event object. The standard event object has a function available on it called `stopPropagation`, which when invoked on a handler's event object makes it so that handler is run, but the event doesn't bubble any further up the chain, so no more handlers will be run.
-One thing should be noticed: **For compatibility with previous versions, Weex does not turn on event bubbling by default. You need to add `bubble = "true"` on the root element's properties to turn on the bubbling mechanism. Otherwise, the event will not be propagated upwards, keeping the same effect as the previous version.**
+Weex implemented this event bubbling phase in the 0.13 SDK, and for the record, the event bubbling phase is not enabled by default - You should use a attribute `bubble=true` on the root element to turn this feature on.
-### stopPropagation
+## How To Use
-In the event handler function, you can use the `e.stopPropagation()` method to prevent the event from escalating. Note that `e.stopPropagation()` differs from `bubble = "true"`, which affects only the current elements and the propagation of parent elements, without affecting the propagation of child elements; the latter is a switching mechanism that is added for compatibility, Will be a global shutdown or open the bubble mechanism, the two can co-exist, as follows:
+The event bubbling is not enabled by default, you should use `bubble="true"` in the root element to turn it on.
```html
<template>
- <div class="root" @click="rootClick" bubble="true">
- <text style="font-size: 40px;">{{rootText}}</text>
- <div class="outer" @click="parentClick">
- <div>
- <text style="font-size: 40px;">{{parentText}}</text>
- </div>
- <text class="inner" @click="click">{{innerText}}</text>
- </div>
+ <!-- Use it in the root element to turn it on. -->
+ <div bubble="true">
+ ...
</div>
</template>
+```
-<script>
- module.exports = {
- data: {
- innerText: 'click me',
- parentText: '',
- rootText: ''
- },
- methods: {
- click: function(e) {
- this.innerText = 'inner bubble'
- },
- parentClick: function(e) {
- this.parentText = 'parent bubble'
- e.stopPropagation()
- },
- rootClick: function(e) {
- this.rootText = 'root bubble'
- // e.stopPropagation()
- }
- }
- }
-</script>
-
-<style scoped>
- .inner {
- font-size: 40px;
- text-align: center;
- background-color: #7a9b1b;
- padding: 40px;
- }
+## Stop Bubbling
- .outer {
- font-size: 40px;
- text-align: center;
- background-color: #9b7a1b;
- padding: 120px;
- }
+In the event handler function, you can use the `event.stopPropagation()` method to prevent the event from escalating, which is exactly like the event's method with the same name in [DOM standard](https://dom.spec.whatwg.org/#dom-event-stoppropagation). Note that `event.stopPropagation()` differs from `bubble = "true"`, which affects only the current elements and the propagation of parent elements, without affecting the propagation of child elements; the latter is a switching mechanism that is added for compatibility, Will be a global shutdown or open the bubble mechanism, the two can co-exist.
- .root {
- font-size: 40px;
- text-align: center;
- background-color: #7a1b9b;
- padding: 80px;
+```javascript
+{
+ handleClick (event) {
+ // stop event propagation.
+ event.stopPropagation()
}
-</style>
+}
```
-[try it](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69)
+## Notice
+
+One thing should be noticed: **For compatibility reason, Weex does not turn on event bubbling by default. You need to add `bubble = "true"` on the root element's properties to turn on the bubbling mechanism. Otherwise, Weex will keep working in the old way, without the event bubbling effect.**
+
+## Examples
+
+[enable event bubbling](http://dotwe.org/vue/fa2957ce3e9eb47ad9ae1da22d845e95): Use Weex playground APP to scan the qr-code, and then click on the middle of the rectangle with a line of text 'click me' on, you can see the event bubbling up, being handled with every listener binding on each div element, printing messages which indicate that they are indeed been reached by the event.
-Run the above code, open with the client, click on the middle of the element, you can see the event up to the parent element is terminated, no longer continue to spread to the root element.
+[stop event propagation](http://dotwe.org/vue/2cc80e19c9b2430fb780234628065a69): Use Weex playground APP to scan the qr-code, and then click on the middle of the rectangle with a line of text 'click me' on, you can see the event bubbling is disturbed, no longer continue to spread to the root element.