You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/20 03:36:27 UTC
[01/50] incubator-weex git commit: * [doc] Update weex-vue-render.js
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 9cd4dae2b -> b3aa98de2
* [doc] Update weex-vue-render.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/16ba1485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/16ba1485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/16ba1485
Branch: refs/heads/0.11-dev
Commit: 16ba148532739ccfb9373763a32961706c225d74
Parents: 6e72a24
Author: Yun Dong <yu...@gmail.com>
Authored: Thu Mar 2 00:45:55 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Thu Mar 2 00:45:55 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/source/js/example.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/16ba1485/doc/themes/weex/source/js/example.js
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/js/example.js b/doc/themes/weex/source/js/example.js
index e87215e..43012c4 100644
--- a/doc/themes/weex/source/js/example.js
+++ b/doc/themes/weex/source/js/example.js
@@ -16,7 +16,7 @@
'}' +
'</style>' +
'<script src="https://unpkg.com/vue/dist/vue.runtime.js"></script>' +
- '<script src="https://unpkg.com/weex-vue-render/index.js"></script>' +
+ '<script src="https://unpkg.com/weex-vue-render@0.10.0/dist/index.min.js"></script>' +
'</head>' +
'<body>' +
'<div id="root"></div>' +
[28/50] incubator-weex git commit: Update integrate-to-your-app.md
Posted by cx...@apache.org.
Update integrate-to-your-app.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7a5c202f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7a5c202f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7a5c202f
Branch: refs/heads/0.11-dev
Commit: 7a5c202f46997f19120b91e9c95fbe23ac56097e
Parents: d8ab10b
Author: \u52fe\u4e09\u80a1\u56db <zh...@me.com>
Authored: Fri Mar 10 17:10:32 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Mar 10 17:10:32 2017 +0800
----------------------------------------------------------------------
doc/source/guide/integrate-to-your-app.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7a5c202f/doc/source/guide/integrate-to-your-app.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/integrate-to-your-app.md b/doc/source/guide/integrate-to-your-app.md
index 7d67d84..36176dd 100644
--- a/doc/source/guide/integrate-to-your-app.md
+++ b/doc/source/guide/integrate-to-your-app.md
@@ -1,7 +1,7 @@
---
title: Integrate to Your App
type: guide
-order: 3
+order: 1.2
has_chapter_content: false
chapter_title: Intro
version: 2.1
@@ -276,4 +276,4 @@ In the dealloc phase of the viewController destroyed Weex instance, can play a r
#### Import the Weex SDK framework to the project.
The Weex SDK can be compiled from the source code. You can try the latest feature in the new feature or bugfix branch.
-Refer to [here](https://open.taobao.com/doc2/detail?spm=a219a.7629140.0.0.tFddsV&&docType=1&articleId=104829) for direct import of weexSDK.
\ No newline at end of file
+Refer to [here](https://open.taobao.com/doc2/detail?spm=a219a.7629140.0.0.tFddsV&&docType=1&articleId=104829) for direct import of weexSDK.
[30/50] incubator-weex git commit: Update set-up-env.md
Posted by cx...@apache.org.
Update set-up-env.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/833c7dfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/833c7dfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/833c7dfc
Branch: refs/heads/0.11-dev
Commit: 833c7dfc7832683169086b4e2d46728385b3587c
Parents: b9cadf5
Author: \u52fe\u4e09\u80a1\u56db <zh...@me.com>
Authored: Fri Mar 10 17:11:00 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Mar 10 17:11:00 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/set-up-env.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/833c7dfc/doc/source/cn/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md
index 5d77a45..437ab06 100644
--- a/doc/source/cn/guide/set-up-env.md
+++ b/doc/source/cn/guide/set-up-env.md
@@ -1,7 +1,7 @@
---
title: \u642d\u5efa\u5f00\u53d1\u73af\u5883
type: guide
-order: 2
+order: 1.1
version: 2.1
has_chapter_content: true
---
[50/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/dev' into 0.11-dev
# Conflicts:
# examples/module/websocket-demo.we
# ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b3aa98de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b3aa98de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b3aa98de
Branch: refs/heads/0.11-dev
Commit: b3aa98de26f97bf5f84644a055b1ef203d0d0249
Parents: ac8a7bd 9745b74
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 20 10:52:15 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 20 10:52:15 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 38 +-
doc/_config.yml | 9 +-
doc/advanced/extend-to-android.md | 2 +-
doc/package.json | 2 +-
doc/source/cn/faq.md | 6 +-
doc/source/cn/guide/contributing.md | 106 +++++
doc/source/cn/guide/dev-with-weexpack.md | 11 -
doc/source/cn/guide/index.md | 123 ++----
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/intro/devtools.md | 99 -----
doc/source/cn/guide/intro/index.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 2 +-
doc/source/cn/guide/set-up-env.md | 128 ++++++
doc/source/cn/guide/tools/devtools.md | 111 ++++++
doc/source/cn/guide/tools/index.md | 11 +
doc/source/cn/guide/tools/weexpack.md | 388 +++++++++++++++++++
.../cn/references/advanced/extend-jsfm.md | 2 +-
.../cn/references/advanced/extend-to-android.md | 22 +-
.../cn/references/advanced/extend-to-html5.md | 2 +-
.../cn/references/advanced/extend-to-ios.md | 233 +++++------
doc/source/cn/references/advanced/index.md | 2 +-
.../advanced/integrate-devtool-to-android.md | 6 +-
.../advanced/integrate-devtool-to-ios.md | 8 +-
doc/source/cn/references/android-apis.md | 25 +-
doc/source/cn/references/common-style.md | 10 +-
doc/source/cn/references/components/a.md | 25 +-
doc/source/cn/references/components/cell.md | 7 +-
doc/source/cn/references/components/div.md | 12 +-
doc/source/cn/references/components/image.md | 18 +-
.../cn/references/components/indicator.md | 3 +-
doc/source/cn/references/components/input.md | 2 +-
doc/source/cn/references/components/list.md | 6 +-
doc/source/cn/references/components/loading.md | 2 +
doc/source/cn/references/components/refresh.md | 4 +-
doc/source/cn/references/components/scroller.md | 6 +-
doc/source/cn/references/components/slider.md | 2 +-
doc/source/cn/references/components/switch.md | 2 +-
doc/source/cn/references/components/text.md | 2 +-
doc/source/cn/references/components/textarea.md | 2 +-
doc/source/cn/references/components/video.md | 2 +-
doc/source/cn/references/components/web.md | 2 +-
doc/source/cn/references/gesture.md | 3 +-
doc/source/cn/references/ios-apis.md | 4 +-
doc/source/cn/references/js-service/index.md | 118 ++++++
.../cn/references/migration/difference.md | 2 +-
doc/source/cn/references/migration/index.md | 2 +-
.../references/migration/migration-from-weex.md | 2 +-
doc/source/cn/references/modules/animation.md | 4 +-
doc/source/cn/references/modules/clipboard.md | 2 +-
doc/source/cn/references/modules/dom.md | 8 +-
doc/source/cn/references/modules/globalevent.md | 2 +-
doc/source/cn/references/modules/index.md | 31 +-
doc/source/cn/references/modules/modal.md | 2 +-
doc/source/cn/references/modules/navigator.md | 2 +-
doc/source/cn/references/modules/storage.md | 4 +-
doc/source/cn/references/modules/stream.md | 2 +-
doc/source/cn/references/modules/websocket.md | 215 ++++++++++
doc/source/cn/references/modules/webview.md | 2 +-
doc/source/cn/references/path.md | 32 +-
.../cn/references/vue/difference-of-vuex.md | 2 +-
.../cn/references/vue/difference-with-web.md | 9 +-
doc/source/cn/references/vue/index.md | 2 +-
.../cn/v-0.10/advanced/extend-to-html5.md | 2 +-
.../cn/v-0.10/advanced/integrate-to-android.md | 4 +-
.../cn/v-0.10/references/modules/globalevent.md | 2 +-
.../cn/v-0.10/references/modules/storage.md | 2 +-
doc/source/cn/v-0.10/tools/devtools.md | 4 +-
doc/source/faq.md | 5 +-
doc/source/guide/contributing.md | 106 +++++
doc/source/guide/dev-with-weexpack.md | 12 -
doc/source/guide/index.md | 49 ++-
doc/source/guide/integrate-to-your-app.md | 274 ++++++++++++-
doc/source/guide/intro/devtools.md | 100 -----
doc/source/guide/intro/using-vue.md | 2 +-
doc/source/guide/set-up-env.md | 93 +++++
doc/source/guide/tools/devtools.md | 100 +++++
doc/source/guide/tools/index.md | 11 +
doc/source/guide/tools/weexpack.md | 300 ++++++++++++++
doc/source/references/advanced/extend-jsfm.md | 159 +++++++-
.../references/advanced/extend-to-android.md | 20 +-
.../references/advanced/extend-to-html5.md | 88 ++++-
.../advanced/integrate-devtool-to-android.md | 137 ++++++-
.../advanced/integrate-devtool-to-ios.md | 184 ++++++++-
doc/source/references/android-apis.md | 211 +++++++++-
doc/source/references/common-style.md | 16 +-
doc/source/references/components/a.md | 2 +-
doc/source/references/components/cell.md | 4 +-
doc/source/references/components/div.md | 6 +-
doc/source/references/components/image.md | 11 +-
doc/source/references/components/indicator.md | 6 +-
doc/source/references/components/input.md | 4 +-
doc/source/references/components/list.md | 4 +-
doc/source/references/components/refresh.md | 4 +-
doc/source/references/components/scroller.md | 10 +-
doc/source/references/components/slider.md | 12 +-
doc/source/references/components/switch.md | 4 +-
doc/source/references/components/text.md | 2 +-
doc/source/references/components/textarea.md | 4 +-
doc/source/references/components/video.md | 4 +-
doc/source/references/components/web.md | 6 +-
doc/source/references/gesture.md | 2 +-
doc/source/references/ios-apis.md | 70 +++-
doc/source/references/modules/animation.md | 2 +-
doc/source/references/modules/clipboard.md | 2 +-
doc/source/references/modules/dom.md | 8 +-
doc/source/references/modules/globalevent.md | 6 +-
doc/source/references/modules/index.md | 31 +-
doc/source/references/modules/modal.md | 2 +-
doc/source/references/modules/navigator.md | 2 +-
doc/source/references/modules/storage.md | 4 +-
doc/source/references/modules/stream.md | 2 +-
doc/source/references/modules/websocket.md | 214 ++++++++++
doc/source/references/modules/webview.md | 8 +-
doc/source/references/native-dom-api.md | 203 +++++++++-
doc/source/references/platfrom-difference.md | 11 +
doc/source/references/vue/difference-of-vuex.md | 85 +++-
.../references/vue/difference-with-web.md | 143 ++++++-
doc/source/references/weex-variable.md | 41 +-
doc/source/v-0.10/advanced/extend-to-html5.md | 2 +-
.../v-0.10/advanced/integrate-to-android.md | 6 +-
.../guide/how-to/preview-in-playground-app.md | 2 +-
.../v-0.10/references/modules/globalevent.md | 2 +-
doc/themes/weex/languages/cn.yml | 5 +-
doc/themes/weex/languages/en.yml | 45 ++-
.../weex/layout/_partial/after-footer.ejs | 2 +-
doc/themes/weex/layout/_partial/footer.ejs | 8 +-
doc/themes/weex/layout/_partial/header.ejs | 30 +-
doc/themes/weex/layout/_partial/search-form.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 15 +-
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/index.ejs | 29 +-
doc/themes/weex/source/css/index.scss | 4 +-
doc/themes/weex/source/css/media-queries.scss | 3 +
doc/themes/weex/source/css/partial/footer.scss | 1 +
doc/themes/weex/source/css/partial/header.scss | 32 +-
.../weex/source/css/partial/search-form.scss | 3 -
doc/themes/weex/source/css/partial/sidebar.scss | 1 +
doc/themes/weex/source/js/common.js | 77 +++-
doc/themes/weex/source/js/example.js | 2 +-
examples/module/websocket-demo.we | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 17 +-
143 files changed, 4184 insertions(+), 815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3aa98de/examples/module/websocket-demo.we
----------------------------------------------------------------------
diff --cc examples/module/websocket-demo.we
index 4fa338c,74ad8a6..65de2e7
--- a/examples/module/websocket-demo.we
+++ b/examples/module/websocket-demo.we
@@@ -1,124 -1,124 +1,124 @@@
<template>
- <scroller>
- <div>
- <div style="background-color: #286090">
- <text class="title" style="height: 80px ;padding: 20px;color: white">websocket</text>
- </div>
- <input
- type="text"
- placeholder="please input message to send"
- class="input"
- autofocus="false"
- value=""
- onchange="onchange"
- oninput="oninput"
- id = "input"
- />
- <div style="flex-direction: row; justify-content: center;">
- <text class="button" onclick="{{connect}}">connect</text>
- <text class="button" onclick="{{send}}">send</text>
- <text class="button" onclick="{{close}}">close</text>
- </div>
- <div style="background-color: lightgray;margin-top: 20px">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = send</text>
- </div>
- <text style="color: black;height: 80px">{{sendinfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onopen</text>
- </div>
- <text style="color: black;height: 80px">{{onopeninfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onmessage</text>
- </div>
- <text style="color: black;height: 100px">{{onmessage}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onclose</text>
- </div>
- <text style="color: black;height: 80px">{{oncloseinfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = onerror</text>
- </div>
- <text style="color: black;height: 80px">{{onerrorinfo}}</text>
- <div style="background-color: lightgray">
- <text class="title" style="height: 80px ;padding: 20px;color: black">method = close</text>
- </div>
- <text style="color: black;height: 80px">{{closeinfo}}</text>
- </div>
- </div>
- </scroller>
+ <scroller>
+ <div>
+ <div style="background-color: #286090">
+ <text class="title" style="height: 80 ;padding: 20;color: #FFFFFF">websocket</text>
+ </div>
+ <input
+ type="text"
+ placeholder="please input message to send"
+ class="input"
+ autofocus="false"
+ value=""
+ onchange="onchange"
+ oninput="oninput"
+ id = "input"
+ />
+ <div style="flex-direction: row; justify-content: center;">
+ <text class="button" onclick="{{connect}}">connect</text>
+ <text class="button" onclick="{{send}}">send</text>
+ <text class="button" onclick="{{close}}">close</text>
+ </div>
+ <div style="background-color: #D3D3D3;margin-top: 20">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = send</text>
+ </div>
+ <text style="color: #000000;height: 80">{{sendinfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onopen</text>
+ </div>
+ <text style="color: #000000;height: 80">{{onopeninfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onmessage</text>
+ </div>
+ <text style="color: #000000;height: 100">{{onmessage}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onclose</text>
+ </div>
+ <text style="color: #000000;height: 80">{{oncloseinfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = onerror</text>
+ </div>
+ <text style="color: #000000;height: 80">{{onerrorinfo}}</text>
+ <div style="background-color: #D3D3D3">
+ <text class="title" style="height: 80 ;padding: 20;color: #000000">method = close</text>
+ </div>
+ <text style="color: #000000;height: 80">{{closeinfo}}</text>
+ </div>
+ </div>
+ </scroller>
</template>
<style>
- .input {
- font-size: 40px;
- height: 80px;
- width: 600px;
- }
- .button {
- font-size: 36px;
- width: 150px;
- color: #41B883;
- text-align: center;
- padding-top: 10px;
- padding-bottom: 10px;
- border-width: 2px;
- border-style: solid;
- margin-right: 20px;
- border-color: rgb(162, 217, 192);
- background-color: rgba(162, 217, 192, 0.2);
- }
+ .input {
+ font-size: 40;
+ height: 80;
+ width: 600;
+ }
+ .button {
+ font-size: 36;
+ width: 150;
+ color: #41B883;
+ text-align: center;
+ padding-top: 10;
+ padding-bottom: 10;
+ border-width: 2;
+ border-style: solid;
+ margin-right: 20;
+ border-color: rgb(162, 217, 192);
+ background-color: rgba(162, 217, 192, 0.2);
+ }
</style>
<script>
- var websocket = require('@weex-module/webSocket');
- module.exports = {
- data: {
- connectinfo: '',
- sendinfo: '',
- onopeninfo: '',
- onmessage: '',
- oncloseinfo: '',
- onerrorinfo: '',
- closeinfo: '',
- txtInput:'',
- navBarHeight: 88,
- title: 'Navigator',
- dir: 'examples',
- baseURL: '',
- },
- methods: {
- connect:function() {
- websocket.WebSocket('ws://echo.websocket.org','');
- var self = this;
- self.onopeninfo = 'connecting...'
- websocket.onopen = function(e)
- {
- self.onopeninfo = 'websocket open';
- }
- websocket.onmessage = function(e)
- {
- self.onmessage = e.data;
- }
- websocket.onerror = function(e)
- {
- self.onerrorinfo = e.data;
- }
- websocket.onclose = function(e)
- {
- self.onopeninfo = '';
- self.onerrorinfo = e.code;
- }
- },
- send:function(e) {
- var input = this.$el('input');
- input.blur();
- websocket.send(this.txtInput);
- this.sendinfo = this.txtInput;
- },
- oninput: function(event) {
- this.txtInput = event.value;
- },
- close:function(e) {
- websocket.close();
- },
+ var websocket = require('@weex-module/webSocket');
+ module.exports = {
+ data: {
+ connectinfo: '',
+ sendinfo: '',
+ onopeninfo: '',
+ onmessage: '',
+ oncloseinfo: '',
+ onerrorinfo: '',
+ closeinfo: '',
+ txtInput:'',
+ navBarHeight: 88,
+ title: 'Navigator',
+ dir: 'examples',
+ baseURL: '',
+ },
+ methods: {
+ connect:function() {
+ websocket.WebSocket('ws://echo.websocket.org','');
+ var self = this;
+ self.onopeninfo = 'connecting...'
+ websocket.onopen = function(e)
+ {
+ self.onopeninfo = 'websocket open';
+ }
+ websocket.onmessage = function(e)
+ {
+ self.onmessage = e.data;
}
- };
+ websocket.onerror = function(e)
+ {
- self.onerrorinfo = e.data;
++ self.onerrorinfo = e.data;
+ }
+ websocket.onclose = function(e)
+ {
+ self.onopeninfo = '';
+ self.onerrorinfo = e.code;
+ }
+ },
+ send:function(e) {
+ var input = this.$el('input');
+ input.blur();
+ websocket.send(this.txtInput);
+ this.sendinfo = this.txtInput;
+ },
+ oninput: function(event) {
+ this.txtInput = event.value;
+ },
+ close:function(e) {
+ websocket.close();
+ },
+ }
+ };
</script>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3aa98de/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b3aa98de/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
index 6668e9d,23b1b1b..443595a
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@@ -342,23 -342,13 +342,22 @@@ static BOOL WXNotStat
if ([self isFileExist:fpath]) {
// if the font file is not the correct font file. it will crash by singal 9
CFURLRef fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (__bridge CFStringRef)fpath, kCFURLPOSIXPathStyle, false);
- CGDataProviderRef fontDataProvider = CGDataProviderCreateWithURL(fontURL);
- CFRelease(fontURL);
- CGFontRef graphicFont = CGFontCreateWithDataProvider(fontDataProvider);
- CGDataProviderRelease(fontDataProvider);
- CTFontRef smallFont = CTFontCreateWithGraphicsFont(graphicFont, size, NULL, NULL);
- CFRelease(graphicFont);
- font = (__bridge_transfer UIFont*)smallFont;
+ if (fontURL) {
+ CFErrorRef error = nil;
+ CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error);
+ if (error) {
+ CFRelease(error);
+ error = nil;
+ CTFontManagerUnregisterFontsForURL(fontURL, kCTFontManagerScopeProcess, NULL);
+ CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, NULL);
+ }
+ NSArray *descriptors = (__bridge_transfer NSArray *)CTFontManagerCreateFontDescriptorsFromURL(fontURL);
+ // length of descriptors here will be only one.
+ for (NSFontDescriptor *desc in descriptors) {
+ font = [UIFont fontWithDescriptor:desc size:fontSize];
+ }
+ CFRelease(fontURL);
+ }
-
}else {
[[WXRuleManager sharedInstance] removeRule:@"fontFace" rule:@{@"fontFamily": fontFamily}];
}
[42/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/571bfd1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/571bfd1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/571bfd1a
Branch: refs/heads/0.11-dev
Commit: 571bfd1a41d8f50a6713bb2687d80b33e6df604d
Parents: 93038db 00def9e
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 16 19:56:08 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 16 19:56:08 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++---
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4336768 bytes
.../com/taobao/weex/bridge/WXBridgeManager.java | 10 +----
html5/shared/freeze.js | 45 ++++++++++++++++++-
html5/test/unit/shared/index.js | 2 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +++---
.../Recycler/WXRecyclerUpdateController.m | 9 ++--
package.json | 2 +-
9 files changed, 68 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
[47/50] incubator-weex git commit: * [ios] draw iconfont use coreText
Posted by cx...@apache.org.
* [ios] draw iconfont use coreText
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ece390f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ece390f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ece390f3
Branch: refs/heads/0.11-dev
Commit: ece390f36b29fa9d61af89c5e9a98f4ed57dc62a
Parents: 3a1cc07
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 17 21:57:10 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 17 21:57:10 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 27 +++++++++++++++---------
1 file changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ece390f3/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
index 12677e3..2289646 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -342,19 +342,26 @@ static BOOL WXNotStat;
if ([self isFileExist:fpath]) {
// if the font file is not the correct font file. it will crash by singal 9
CFURLRef fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (__bridge CFStringRef)fpath, kCFURLPOSIXPathStyle, false);
- CGDataProviderRef fontDataProvider = CGDataProviderCreateWithURL(fontURL);
if (fontURL) {
+ CFErrorRef error = nil;
+ CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error);
+ if (error) {
+ CFRelease(error);
+ error = nil;
+ CTFontManagerUnregisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error);
+ CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error);
+ }
+ NSArray *descriptors = (__bridge_transfer NSArray *)CTFontManagerCreateFontDescriptorsFromURL(fontURL);
+ // length of descriptors here will be only one.
+ for (NSFontDescriptor *desc in descriptors) {
+ font = [UIFont fontWithDescriptor:desc size:fontSize];
+ }
CFRelease(fontURL);
+ if (error) {
+ CFRelease(error);
+ }
}
- CGFontRef graphicFont = CGFontCreateWithDataProvider(fontDataProvider);
- if (fontDataProvider) {
- CGDataProviderRelease(fontDataProvider);
- }
- CTFontRef smallFont = CTFontCreateWithGraphicsFont(graphicFont, size, NULL, NULL);
- if (graphicFont) {
- CFRelease(graphicFont);
- }
- font = (__bridge_transfer UIFont*)smallFont;
+
}else {
[[WXRuleManager sharedInstance] removeRule:@"fontFace" rule:@{@"fontFamily": fontFamily}];
}
[25/50] incubator-weex git commit: * [doc] Fix indicator example.
Posted by cx...@apache.org.
* [doc] Fix indicator example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/80e7b8c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/80e7b8c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/80e7b8c3
Branch: refs/heads/0.11-dev
Commit: 80e7b8c3731e105b6c089cda2498589e4e5ec389
Parents: 9034435
Author: Yun Dong <yu...@gmail.com>
Authored: Fri Mar 10 15:24:39 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Fri Mar 10 15:24:39 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/indicator.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/80e7b8c3/doc/source/cn/references/components/indicator.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/indicator.md b/doc/source/cn/references/components/indicator.md
index 7980bb5..aa1cab4 100644
--- a/doc/source/cn/references/components/indicator.md
+++ b/doc/source/cn/references/components/indicator.md
@@ -107,6 +107,7 @@ version: 2.1
item-color: green;
item-selected-color: red;
item-size: 50px;
+ position: absolute;
top: 200px;
left: 200px;
}
@@ -132,4 +133,4 @@ version: 2.1
</script>
```
-[try it](http://dotwe.org/vue/d2a654c4b75f1b4d80336c8a5fe133b9)
+[try it](http://dotwe.org/vue/e1b4fd8a37ed4cafd8f5e161698754aa)
[02/50] incubator-weex git commit: * [doc] Migrate examples to dotwe.
Posted by cx...@apache.org.
* [doc] Migrate examples to dotwe.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c47e81c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c47e81c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c47e81c
Branch: refs/heads/0.11-dev
Commit: 2c47e81ce10f9cd92f21e4f738f0c12c7314a243
Parents: 16ba148
Author: Yun Dong <yu...@gmail.com>
Authored: Thu Mar 2 11:11:22 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Thu Mar 2 11:11:22 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/a.md | 8 ++++----
doc/source/cn/references/components/cell.md | 2 +-
doc/source/cn/references/components/div.md | 2 +-
doc/source/cn/references/components/image.md | 2 +-
doc/source/cn/references/components/indicator.md | 2 +-
doc/source/cn/references/components/input.md | 2 +-
doc/source/cn/references/components/list.md | 2 +-
doc/source/cn/references/components/loading.md | 2 ++
doc/source/cn/references/components/refresh.md | 2 +-
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/cn/references/components/slider.md | 2 +-
doc/source/cn/references/components/switch.md | 2 +-
doc/source/cn/references/components/text.md | 2 +-
doc/source/cn/references/components/textarea.md | 2 +-
doc/source/cn/references/components/video.md | 2 +-
doc/source/cn/references/components/web.md | 2 +-
doc/source/cn/references/modules/animation.md | 2 +-
doc/source/cn/references/modules/clipboard.md | 2 +-
doc/source/cn/references/modules/dom.md | 4 ++--
doc/source/cn/references/modules/modal.md | 2 +-
doc/source/cn/references/modules/navigator.md | 2 +-
doc/source/cn/references/modules/storage.md | 2 +-
doc/source/cn/references/modules/stream.md | 2 +-
doc/source/cn/references/modules/webview.md | 2 +-
doc/source/references/components/a.md | 2 +-
doc/source/references/components/div.md | 2 +-
doc/source/references/components/image.md | 2 +-
doc/source/references/components/indicator.md | 2 +-
doc/source/references/components/input.md | 2 +-
doc/source/references/components/list.md | 2 +-
doc/source/references/components/refresh.md | 2 +-
doc/source/references/components/scroller.md | 2 +-
doc/source/references/components/slider.md | 2 +-
doc/source/references/components/switch.md | 2 +-
doc/source/references/components/text.md | 2 +-
doc/source/references/components/textarea.md | 2 +-
doc/source/references/components/video.md | 2 +-
doc/source/references/components/web.md | 2 +-
doc/source/references/modules/animation.md | 2 +-
doc/source/references/modules/clipboard.md | 2 +-
doc/source/references/modules/dom.md | 4 ++--
doc/source/references/modules/modal.md | 2 +-
doc/source/references/modules/navigator.md | 2 +-
doc/source/references/modules/storage.md | 2 +-
doc/source/references/modules/stream.md | 2 +-
doc/source/references/modules/webview.md | 2 +-
46 files changed, 52 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/a.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/a.md b/doc/source/cn/references/components/a.md
index ce2dcf1..f6fd610 100644
--- a/doc/source/cn/references/components/a.md
+++ b/doc/source/cn/references/components/a.md
@@ -43,7 +43,7 @@ version: 2.1
## \u7ea6\u675f
-1. **\u4e0d\u80fd**\u76f4\u63a5\u5728 `<a>` \u4e2d\u6dfb\u52a0\u6587\u672c\u3002
+- **\u4e0d\u80fd**\u76f4\u63a5\u5728 `<a>` \u4e2d\u6dfb\u52a0\u6587\u672c\u3002
\u9519\u8bef\u793a\u4f8b\uff0c\u201cclick\u201d \u65e0\u6cd5\u88ab\u6b63\u5e38\u6e32\u67d3\u3002
```html
@@ -62,9 +62,9 @@ version: 2.1
</style>
```
-[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/0a22d65138691a208e3fb1f8f6392b38)
+ [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/0a22d65138691a208e3fb1f8f6392b38)
-2. \u8bf7\u4e0d\u8981\u4e3a `<a>` \u6dfb\u52a0 `click` \u4e8b\u4ef6\u3002\u6211\u4eec\u4e0d\u80fd\u786e\u4fdd `click` \u4e8b\u4ef6\u548c `href` \u8df3\u8f6c\u7684\u6267\u884c\u987a\u5e8f\u3002
+- \u8bf7\u4e0d\u8981\u4e3a `<a>` \u6dfb\u52a0 `click` \u4e8b\u4ef6\u3002\u6211\u4eec\u4e0d\u80fd\u786e\u4fdd `click` \u4e8b\u4ef6\u548c `href` \u8df3\u8f6c\u7684\u6267\u884c\u987a\u5e8f\u3002
## \u793a\u4f8b
@@ -101,4 +101,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/a.html)
+[try it](http://dotwe.org/vue/025db54e37123ab5336a4b848397660f)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/cell.md b/doc/source/cn/references/components/cell.md
index f7ecbe4..8f90d9c 100644
--- a/doc/source/cn/references/components/cell.md
+++ b/doc/source/cn/references/components/cell.md
@@ -102,4 +102,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/list.html)
+[try it](http://dotwe.org/vue/d31c85e7cd2dc54fa098e920a5376c38)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/div.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/div.md b/doc/source/cn/references/components/div.md
index 2790c2c..79cfae0 100644
--- a/doc/source/cn/references/components/div.md
+++ b/doc/source/cn/references/components/div.md
@@ -113,4 +113,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/div.html)
+[try it](http://dotwe.org/vue/edfbd1806508cb86254b03dc0b8e28ac)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/image.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/image.md b/doc/source/cn/references/components/image.md
index 4743414..1c70f10 100644
--- a/doc/source/cn/references/components/image.md
+++ b/doc/source/cn/references/components/image.md
@@ -158,4 +158,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/image.html)
+[try it](http://dotwe.org/vue/e2122bc245beafb0348d79bfd1274904)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/indicator.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/indicator.md b/doc/source/cn/references/components/indicator.md
index 5425af0..7980bb5 100644
--- a/doc/source/cn/references/components/indicator.md
+++ b/doc/source/cn/references/components/indicator.md
@@ -132,4 +132,4 @@ version: 2.1
</script>
```
-[try it](../../../examples/indicator.html)
+[try it](http://dotwe.org/vue/d2a654c4b75f1b4d80336c8a5fe133b9)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/input.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/input.md b/doc/source/cn/references/components/input.md
index 97d4787..a73db32 100644
--- a/doc/source/cn/references/components/input.md
+++ b/doc/source/cn/references/components/input.md
@@ -178,4 +178,4 @@ Weex \u5185\u7f6e\u7684 `<input>` \u7ec4\u4ef6\u7528\u6765\u521b\u5efa\u63a5\u6536\u7528\u6237\u8f93\u5165\u5b57\u7b26\u7684\u8f93\u5165\u7ec4
</style>
```
-[try it](../../../examples/input.html)
+[try it](http://dotwe.org/vue/c1b1a5fdcf0937df1d847f8812a7ccb2)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/list.md b/doc/source/cn/references/components/list.md
index 453108c..2cb0a90 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -155,4 +155,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/list.html)
+[try it](http://dotwe.org/vue/d31c85e7cd2dc54fa098e920a5376c38)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/loading.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/loading.md b/doc/source/cn/references/components/loading.md
index ca28405..cd630c3 100644
--- a/doc/source/cn/references/components/loading.md
+++ b/doc/source/cn/references/components/loading.md
@@ -123,3 +123,5 @@ version: 2.1
}
</style>
```
+
+[Try it](http://dotwe.org/vue/d5c1b2336a703a6e6e47c303af41ffcd)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/refresh.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/refresh.md b/doc/source/cn/references/components/refresh.md
index 1eba39c..a6eb6fb 100644
--- a/doc/source/cn/references/components/refresh.md
+++ b/doc/source/cn/references/components/refresh.md
@@ -120,6 +120,6 @@ version: 2.1
</style>
```
-[try it](../../../examples/refresh.html)
+[try it](http://dotwe.org/vue/d3db5f344220a6339de044a5e33c502b)
\u66f4\u591a\u793a\u4f8b\u53ef\u67e5\u770b [`<list>`](./list.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/scroller.md b/doc/source/cn/references/components/scroller.md
index acd49d4..4bb9f4b 100644
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@ -171,4 +171,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/scroller.html)
+[try it](http://dotwe.org/vue/2f22f14fb711d88515e63c3f67bed46a)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/slider.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/slider.md b/doc/source/cn/references/components/slider.md
index 745c66c..190e01d 100644
--- a/doc/source/cn/references/components/slider.md
+++ b/doc/source/cn/references/components/slider.md
@@ -102,4 +102,4 @@ version: 2.1
</script>
```
-[try it](../../../examples/slider.html)
+[try it](http://dotwe.org/vue/0c43ffd743c90b3bd9f5371062652e60)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/switch.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/switch.md b/doc/source/cn/references/components/switch.md
index 01c61e1..42b24d9 100644
--- a/doc/source/cn/references/components/switch.md
+++ b/doc/source/cn/references/components/switch.md
@@ -130,4 +130,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/switch.html)
+[try it](http://dotwe.org/vue/06b1d740fb69d04f9ebe9eaf730974d1)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/text.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/text.md b/doc/source/cn/references/components/text.md
index dfb34d6..ac43eea 100644
--- a/doc/source/cn/references/components/text.md
+++ b/doc/source/cn/references/components/text.md
@@ -98,4 +98,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/text.html)
+[try it](http://dotwe.org/vue/154e20171d350a081fba7878c53cf7d2)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/textarea.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/textarea.md b/doc/source/cn/references/components/textarea.md
index d09956d..a5ec4d4 100644
--- a/doc/source/cn/references/components/textarea.md
+++ b/doc/source/cn/references/components/textarea.md
@@ -159,4 +159,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/textarea.html)
+[try it](http://dotwe.org/vue/a1877866e8b91ffa1e6ea9bc66c200fa)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/video.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/video.md b/doc/source/cn/references/components/video.md
index 54fb715..eee6eb9 100644
--- a/doc/source/cn/references/components/video.md
+++ b/doc/source/cn/references/components/video.md
@@ -91,4 +91,4 @@ version: 2.1
</script>
```
-[try it](../../../examples/video.html)
+[try it](http://dotwe.org/vue/01d3d27073a471bb234b1a76e130d197)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/components/web.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/web.md b/doc/source/cn/references/components/web.md
index 72bf4c0..fb48aa9 100644
--- a/doc/source/cn/references/components/web.md
+++ b/doc/source/cn/references/components/web.md
@@ -151,4 +151,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/web.html)
+[try it](http://dotwe.org/vue/154c7fa8ac13e87ff4e7bf9862147d50)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/animation.md b/doc/source/cn/references/modules/animation.md
index 2ae020e..7e6def6 100644
--- a/doc/source/cn/references/modules/animation.md
+++ b/doc/source/cn/references/modules/animation.md
@@ -93,4 +93,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/animation.html)
+[try it](http://dotwe.org/vue/2d1b61bef061448c1a5a13eac9624410)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/clipboard.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/clipboard.md b/doc/source/cn/references/modules/clipboard.md
index 3fc012e..300340c 100644
--- a/doc/source/cn/references/modules/clipboard.md
+++ b/doc/source/cn/references/modules/clipboard.md
@@ -98,4 +98,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/clipboard.html)
+[try it](http://dotwe.org/vue/126d3cfc5533393e28943978b07aa5c1)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/dom.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/dom.md b/doc/source/cn/references/modules/dom.md
index b7473c2..2fa153a 100644
--- a/doc/source/cn/references/modules/dom.md
+++ b/doc/source/cn/references/modules/dom.md
@@ -120,7 +120,7 @@ version: 2.1
</style>
```
-[try it](../../../examples/dom-scroll.html)
+[try it](http://dotwe.org/vue/56e0d256cbb26facd958dbd6424f42b2)
### getComponentRect(ref, callback) <span class="api-version">v0.9.4+</span>
@@ -203,7 +203,7 @@ version: 2.1
</style>
```
-[try it](../../../examples/dom-rect.html)
+[try it](http://dotwe.org/vue/87d4ed571de129ab28052b06a5d65fc8)
## \u5176\u4ed6
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/modal.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/modal.md b/doc/source/cn/references/modules/modal.md
index bc9d610..614d249 100644
--- a/doc/source/cn/references/modules/modal.md
+++ b/doc/source/cn/references/modules/modal.md
@@ -136,4 +136,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/modal.html)
+[try it](http://dotwe.org/vue/a7dddfb24edb72be947fc4eec3803f1d)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/navigator.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/navigator.md b/doc/source/cn/references/modules/navigator.md
index fd258b1..fdfa55d 100644
--- a/doc/source/cn/references/modules/navigator.md
+++ b/doc/source/cn/references/modules/navigator.md
@@ -87,4 +87,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/navigator.html)
+[try it](http://dotwe.org/vue/5c670b07735ee6d08de5c8eb93f91f11)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/storage.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/storage.md b/doc/source/cn/references/modules/storage.md
index d344281..e0c8637 100644
--- a/doc/source/cn/references/modules/storage.md
+++ b/doc/source/cn/references/modules/storage.md
@@ -176,7 +176,7 @@ version: 2.1
</style>
```
-[try it](../../../examples/storage.html)
+[try it](http://dotwe.org/vue/3fdd3e2d1646ca41199d80c7be799858)
## \u5176\u5b83\u53c2\u8003
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/stream.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/stream.md b/doc/source/cn/references/modules/stream.md
index d6b20c3..2ec1695 100644
--- a/doc/source/cn/references/modules/stream.md
+++ b/doc/source/cn/references/modules/stream.md
@@ -121,4 +121,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/stream.html)
+[try it](http://dotwe.org/vue/29bbf2d49fc8a204f98240044bbe211a)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/cn/references/modules/webview.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/webview.md b/doc/source/cn/references/modules/webview.md
index 9a2e4e6..30a1a42 100644
--- a/doc/source/cn/references/modules/webview.md
+++ b/doc/source/cn/references/modules/webview.md
@@ -134,4 +134,4 @@ version: 2.1
</style>
```
-[try it](../../../examples/web.html)
+[try it](http://dotwe.org/vue/154c7fa8ac13e87ff4e7bf9862147d50)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/a.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/a.md b/doc/source/references/components/a.md
index 3b94a1e..ae436bb 100644
--- a/doc/source/references/components/a.md
+++ b/doc/source/references/components/a.md
@@ -68,4 +68,4 @@ We can't guarantee the order of execution between onclick function and href. we
</style>
```
-[try it](../../examples/a.html)
+[try it](http://dotwe.org/vue/025db54e37123ab5336a4b848397660f)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/div.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/div.md b/doc/source/references/components/div.md
index d82ad0d..1bcc162 100644
--- a/doc/source/references/components/div.md
+++ b/doc/source/references/components/div.md
@@ -60,5 +60,5 @@ There is no specific attribute for this component.
</style>
```
-[try it](../../examples/div.html)
+[try it](http://dotwe.org/vue/edfbd1806508cb86254b03dc0b8e28ac)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/image.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/image.md b/doc/source/references/components/image.md
index 6d8fd3f..7cf9814 100644
--- a/doc/source/references/components/image.md
+++ b/doc/source/references/components/image.md
@@ -102,4 +102,4 @@ This component supports no child components.
</style>
```
-[try it](../../examples/image.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/e2122bc245beafb0348d79bfd1274904)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/indicator.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/indicator.md b/doc/source/references/components/indicator.md
index 9093656..29f4454 100644
--- a/doc/source/references/components/indicator.md
+++ b/doc/source/references/components/indicator.md
@@ -118,4 +118,4 @@ There is no specific attribute for this component.
</script>
```
-[try it](../../examples/indicator.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/d2a654c4b75f1b4d80336c8a5fe133b9)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/input.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/input.md b/doc/source/references/components/input.md
index 1033351..837c867 100644
--- a/doc/source/references/components/input.md
+++ b/doc/source/references/components/input.md
@@ -151,4 +151,4 @@ does not support the common-event�'click'. Please listen to the�'input'�or�'
</style>
```
-[try it](../../examples/input.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/c1b1a5fdcf0937df1d847f8812a7ccb2)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/list.md b/doc/source/references/components/list.md
index 07f50ec..a524c7f 100644
--- a/doc/source/references/components/list.md
+++ b/doc/source/references/components/list.md
@@ -170,4 +170,4 @@ For example, a vertical list nested in a vertical list or scroller is not allowe
</style>
```
-[try it](../../examples/list.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/d31c85e7cd2dc54fa098e920a5376c38)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/refresh.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/refresh.md b/doc/source/references/components/refresh.md
index 521e07c..8aaecbb 100644
--- a/doc/source/references/components/refresh.md
+++ b/doc/source/references/components/refresh.md
@@ -211,4 +211,4 @@ common styles: check out [common styles for components](../common-style.html)
</style>
```
-[try it](../../examples/refresh.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/d3db5f344220a6339de044a5e33c502b)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/scroller.md b/doc/source/references/components/scroller.md
index 1de3721..1b65907 100644
--- a/doc/source/references/components/scroller.md
+++ b/doc/source/references/components/scroller.md
@@ -145,4 +145,4 @@ For example, a vertical list nested in a vertical list or scroller is not allowe
</style>
```
-[try it](../../examples/scroller.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/2f22f14fb711d88515e63c3f67bed46a)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/slider.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/slider.md b/doc/source/references/components/slider.md
index e826a2f..a88ff22 100644
--- a/doc/source/references/components/slider.md
+++ b/doc/source/references/components/slider.md
@@ -88,4 +88,4 @@ It supports all kinds of weex components as its slides, especially the `indicato
</script>
```
-[try it](../../examples/slider.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/0c43ffd743c90b3bd9f5371062652e60)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/switch.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/switch.md b/doc/source/references/components/switch.md
index 8756441..8281c5f 100644
--- a/doc/source/references/components/switch.md
+++ b/doc/source/references/components/switch.md
@@ -112,4 +112,4 @@ common styles: check out [common styles for components](../common-style.html)
</style>
```
-[try it](../../examples/switch.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/06b1d740fb69d04f9ebe9eaf730974d1)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/text.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/text.md b/doc/source/references/components/text.md
index fc84214..cfed19b 100644
--- a/doc/source/references/components/text.md
+++ b/doc/source/references/components/text.md
@@ -95,4 +95,4 @@ check out [common events](../common-event.html)
</style>
```
-[try it](../../examples/text.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/154e20171d350a081fba7878c53cf7d2)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/textarea.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/textarea.md b/doc/source/references/components/textarea.md
index 827674c..9b995da 100644
--- a/doc/source/references/components/textarea.md
+++ b/doc/source/references/components/textarea.md
@@ -137,4 +137,4 @@ This component supports no child components.
</style>
```
-[try it](../../examples/textarea.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/a1877866e8b91ffa1e6ea9bc66c200fa)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/video.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/video.md b/doc/source/references/components/video.md
index 9d13989..d73c616 100644
--- a/doc/source/references/components/video.md
+++ b/doc/source/references/components/video.md
@@ -84,4 +84,4 @@ common styles: check out [common styles for components](../common-style.html)
</script>
```
-[try it](../../examples/video.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/01d3d27073a471bb234b1a76e130d197)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/components/web.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/web.md b/doc/source/references/components/web.md
index 7d2aa39..b96097d 100644
--- a/doc/source/references/components/web.md
+++ b/doc/source/references/components/web.md
@@ -144,4 +144,4 @@ We use a simple Browser Demo to show how to use web component and webview module
</style>
```
-[try it](../../examples/web.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/154c7fa8ac13e87ff4e7bf9862147d50)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/animation.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/animation.md b/doc/source/references/modules/animation.md
index a456f12..4a9b7ec 100644
--- a/doc/source/references/modules/animation.md
+++ b/doc/source/references/modules/animation.md
@@ -103,4 +103,4 @@ properties of `transform`:
</style>
```
-[try it](../../examples/animation.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/2d1b61bef061448c1a5a13eac9624410)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/clipboard.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/clipboard.md b/doc/source/references/modules/clipboard.md
index db582b0..5728cc4 100644
--- a/doc/source/references/modules/clipboard.md
+++ b/doc/source/references/modules/clipboard.md
@@ -95,4 +95,4 @@ sets the text to clipboard, having the same effect as copying manually.
</style>
```
-[try it](../../examples/clipboard.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/126d3cfc5533393e28943978b07aa5c1)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/dom.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/dom.md b/doc/source/references/modules/dom.md
index bfd80e0..cd5651e 100644
--- a/doc/source/references/modules/dom.md
+++ b/doc/source/references/modules/dom.md
@@ -114,7 +114,7 @@ Scroll the page to the specified node. This API should only be used on the eleme
</style>
```
-[try it](../../examples/dom-scroll.html)
+[try it](http://dotwe.org/vue/56e0d256cbb26facd958dbd6424f42b2)
### getComponentRect(ref,callback) <span class="api-version">v0.9.4+</span>
@@ -201,4 +201,4 @@ Example Useage:
</style>
```
-[try it](../../examples/dom-rect.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/87d4ed571de129ab28052b06a5d65fc8)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/modal.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/modal.md b/doc/source/references/modules/modal.md
index ea60982..32ffab6 100644
--- a/doc/source/references/modules/modal.md
+++ b/doc/source/references/modules/modal.md
@@ -141,4 +141,4 @@ When a prompt box pops up, the user will have to click either confirm or cancel
</style>
```
-[try it](../../examples/modal.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/a7dddfb24edb72be947fc4eec3803f1d)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/navigator.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/navigator.md b/doc/source/references/modules/navigator.md
index b33dd0c..e3ce51a 100644
--- a/doc/source/references/modules/navigator.md
+++ b/doc/source/references/modules/navigator.md
@@ -86,4 +86,4 @@ pop a weex page onto the navigator stack, you can specify whether apply animatio
</style>
```
-[try it](../../examples/navigator.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/5c670b07735ee6d08de5c8eb93f91f11)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/storage.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/storage.md b/doc/source/references/modules/storage.md
index b7bcf43..faac53c 100644
--- a/doc/source/references/modules/storage.md
+++ b/doc/source/references/modules/storage.md
@@ -169,4 +169,4 @@ Returns an array that contains all keys stored in Storage object.
</style>
```
-[try it](../../examples/storage.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/3fdd3e2d1646ca41199d80c7be799858)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/stream.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/stream.md b/doc/source/references/modules/stream.md
index 09abb3b..986ccdb 100644
--- a/doc/source/references/modules/stream.md
+++ b/doc/source/references/modules/stream.md
@@ -128,4 +128,4 @@ Start a network request, use two callbacks to receive server's response data.
</style>
```
-[try it](../../examples/stream.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/29bbf2d49fc8a204f98240044bbe211a)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c47e81c/doc/source/references/modules/webview.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/webview.md b/doc/source/references/modules/webview.md
index d5dfbdd..1ca1b5e 100644
--- a/doc/source/references/modules/webview.md
+++ b/doc/source/references/modules/webview.md
@@ -152,4 +152,4 @@ webview.reload(webElement.ref);
</style>
```
-[try it](../../examples/web.html)
\ No newline at end of file
+[try it](http://dotwe.org/vue/154c7fa8ac13e87ff4e7bf9862147d50)
\ No newline at end of file
[03/50] incubator-weex git commit: Merge branch 'feature-new-doc' of
http://github.com/DoranYun/incubator-weex into dev This closes #16
Posted by cx...@apache.org.
Merge branch 'feature-new-doc' of http://github.com/DoranYun/incubator-weex into dev
This closes #16
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/de4286ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/de4286ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/de4286ae
Branch: refs/heads/0.11-dev
Commit: de4286ae17951b86b8339ba33e076cb06e453861
Parents: b6d8ab0 2c47e81
Author: sospartan <so...@gmail.com>
Authored: Thu Mar 2 11:29:33 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Thu Mar 2 11:29:33 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/index.md | 35 +++++++-
doc/source/cn/references/components/a.md | 8 +-
doc/source/cn/references/components/cell.md | 2 +-
doc/source/cn/references/components/div.md | 2 +-
doc/source/cn/references/components/image.md | 2 +-
.../cn/references/components/indicator.md | 2 +-
doc/source/cn/references/components/input.md | 2 +-
doc/source/cn/references/components/list.md | 2 +-
doc/source/cn/references/components/loading.md | 2 +
doc/source/cn/references/components/refresh.md | 2 +-
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/cn/references/components/slider.md | 2 +-
doc/source/cn/references/components/switch.md | 2 +-
doc/source/cn/references/components/text.md | 2 +-
doc/source/cn/references/components/textarea.md | 2 +-
doc/source/cn/references/components/video.md | 2 +-
doc/source/cn/references/components/web.md | 2 +-
doc/source/cn/references/modules/animation.md | 2 +-
doc/source/cn/references/modules/clipboard.md | 2 +-
doc/source/cn/references/modules/dom.md | 4 +-
doc/source/cn/references/modules/index.md | 31 +++----
doc/source/cn/references/modules/modal.md | 2 +-
doc/source/cn/references/modules/navigator.md | 2 +-
doc/source/cn/references/modules/storage.md | 2 +-
doc/source/cn/references/modules/stream.md | 2 +-
doc/source/cn/references/modules/websocket.md | 75 +++++++---------
doc/source/cn/references/modules/webview.md | 2 +-
doc/source/guide/index.md | 34 +++++++-
doc/source/references/components/a.md | 2 +-
doc/source/references/components/div.md | 2 +-
doc/source/references/components/image.md | 2 +-
doc/source/references/components/indicator.md | 2 +-
doc/source/references/components/input.md | 2 +-
doc/source/references/components/list.md | 2 +-
doc/source/references/components/refresh.md | 2 +-
doc/source/references/components/scroller.md | 2 +-
doc/source/references/components/slider.md | 2 +-
doc/source/references/components/switch.md | 2 +-
doc/source/references/components/text.md | 2 +-
doc/source/references/components/textarea.md | 2 +-
doc/source/references/components/video.md | 2 +-
doc/source/references/components/web.md | 2 +-
doc/source/references/modules/animation.md | 2 +-
doc/source/references/modules/clipboard.md | 2 +-
doc/source/references/modules/dom.md | 4 +-
doc/source/references/modules/index.md | 31 +++----
doc/source/references/modules/modal.md | 2 +-
doc/source/references/modules/navigator.md | 2 +-
doc/source/references/modules/storage.md | 2 +-
doc/source/references/modules/stream.md | 2 +-
doc/source/references/modules/websocket.md | 91 +++++++++-----------
doc/source/references/modules/webview.md | 2 +-
doc/themes/weex/languages/cn.yml | 2 +-
doc/themes/weex/languages/en.yml | 2 +-
doc/themes/weex/layout/_partial/footer.ejs | 2 +-
doc/themes/weex/layout/_partial/head.ejs | 43 ---------
doc/themes/weex/layout/_partial/header.ejs | 16 ++++
doc/themes/weex/layout/_partial/search-form.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 2 +-
doc/themes/weex/layout/index.ejs | 29 ++++++-
doc/themes/weex/source/css/index.scss | 4 +-
doc/themes/weex/source/css/media-queries.scss | 3 +
doc/themes/weex/source/css/partial/footer.scss | 1 +
doc/themes/weex/source/css/partial/header.scss | 32 ++++++-
.../weex/source/css/partial/search-form.scss | 3 -
doc/themes/weex/source/css/partial/sidebar.scss | 1 +
doc/themes/weex/source/js/common.js | 37 ++++----
doc/themes/weex/source/js/example.js | 2 +-
68 files changed, 320 insertions(+), 260 deletions(-)
----------------------------------------------------------------------
[12/50] incubator-weex git commit: fix a typo in gesture reference doc
Posted by cx...@apache.org.
fix a typo in gesture reference doc
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0cd033cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0cd033cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0cd033cb
Branch: refs/heads/0.11-dev
Commit: 0cd033cbf6055caaeb63df5691c6c40d646a3a85
Parents: 6dc87a7
Author: luxp <lu...@gmail.com>
Authored: Mon Mar 6 14:11:17 2017 +0800
Committer: luxp <lu...@gmail.com>
Committed: Mon Mar 6 14:11:17 2017 +0800
----------------------------------------------------------------------
doc/source/references/gesture.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0cd033cb/doc/source/references/gesture.md
----------------------------------------------------------------------
diff --git a/doc/source/references/gesture.md b/doc/source/references/gesture.md
index eae045a..d93d836 100644
--- a/doc/source/references/gesture.md
+++ b/doc/source/references/gesture.md
@@ -27,7 +27,7 @@ For now, there are four types of gestures:
* `horizontalpan`
* `verticalpan`
* **Swipe**. Swipe is fired when user swipe a touch point on the screen. A serial of motion will only trigger one Swipe gesture.
-* **LongPress**. Swipe is fired when a touch point is held for 500 ms or more.
+* **LongPress**. LongPress is fired when a touch point is held for 500 ms or more.
The Touch gesture and Pan is very close to each other, with following features hold:
[49/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ac8a7bdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ac8a7bdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ac8a7bdc
Branch: refs/heads/0.11-dev
Commit: ac8a7bdc49f9148e71c35c30ab376716a8125154
Parents: 8257680 9cd4dae
Author: acton393 <zh...@gmail.com>
Authored: Sat Mar 18 17:47:09 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Sat Mar 18 17:47:09 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[11/50] incubator-weex git commit: * [doc] update boolean
Posted by cx...@apache.org.
* [doc] update boolean
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dbe45be8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dbe45be8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dbe45be8
Branch: refs/heads/0.11-dev
Commit: dbe45be85d6d2568d12369a032def1a70d81b10e
Parents: be6801e
Author: xkli <56...@qq.com>
Authored: Mon Mar 6 10:58:36 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Mon Mar 6 10:58:36 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/cell.md | 2 +-
doc/source/references/components/cell.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dbe45be8/doc/source/cn/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/cell.md b/doc/source/cn/references/components/cell.md
index 95a3e83..b06e9fc 100644
--- a/doc/source/cn/references/components/cell.md
+++ b/doc/source/cn/references/components/cell.md
@@ -14,7 +14,7 @@ version: 2.1
\u652f\u6301\u6240\u6709 Weex \u7684\u7ec4\u4ef6\u4f5c\u4e3a\u5b83\u7684\u5b50\u7ec4\u4ef6\u3002
## \u5c5e\u6027
-* `keep-scroll-position {boolen}`: <span class="api-version">v0.11+</span> List \u63d2\u5165\u6570\u636e\u540e\u662f\u5426\u4fdd\u6301\u4e0a\u6b21\u6eda\u52a8\u7684\u4f4d\u7f6e
+* `keep-scroll-position {boolean}`: <span class="api-version">v0.11+</span> List \u63d2\u5165\u6570\u636e\u540e\u662f\u5426\u4fdd\u6301\u4e0a\u6b21\u6eda\u52a8\u7684\u4f4d\u7f6e
## \u6837\u5f0f
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dbe45be8/doc/source/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/cell.md b/doc/source/references/components/cell.md
index 14b2572..a018c00 100644
--- a/doc/source/references/components/cell.md
+++ b/doc/source/references/components/cell.md
@@ -19,7 +19,7 @@ This type of component supports all kinds of weex component as its child compone
**Notes:** you can't give `<cell>` a `flex` value. Width of `<cell>` is equal to the width of its parent component `<list>`, and you don't need to specify its height.
-* `keep-scroll-position {boolen}`: <span class="api-version">v0.11+</span> List Whether to keep the last sliding position after inserting the Cell
+* `keep-scroll-position {boolean}`: <span class="api-version">v0.11+</span> List Whether to keep the last sliding position after inserting the Cell
### Styles
[06/50] incubator-weex git commit: * [android] support 1px border &
border-x-y-radius for android. Android now supports 1 px border.
https://github.com/apache/incubator-weex/pull/9 border-x-y-radius works fine
on Android, it is not supported by image on
Posted by cx...@apache.org.
* [android] support 1px border & border-x-y-radius for android.
Android now supports 1 px border. https://github.com/apache/incubator-weex/pull/9
border-x-y-radius works fine on Android, it is not supported by image on iOS.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/687f3b14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/687f3b14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/687f3b14
Branch: refs/heads/0.11-dev
Commit: 687f3b14223a2fd2c1a15d44eb817f97ec2c8aed
Parents: 9086af4
Author: YorkShen <sh...@gmail.com>
Authored: Thu Mar 2 11:12:37 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Mar 2 11:50:19 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 2 +-
doc/source/references/common-style.md | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/687f3b14/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/common-style.md b/doc/source/cn/references/common-style.md
index 7abe9d3..96f6d9d 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -90,7 +90,7 @@ Weex \u5bf9\u4e8e\u957f\u5ea6\u503c\u76ee\u524d\u53ea\u652f\u6301*\u50cf\u7d20*\u503c\uff0c\u4e0d\u652f\u6301\u76f8\u5bf9\u5355\u4f4d\uff08`em`\u3001
- `border-top-right-radius {length}`\uff1a\uff0c\u975e\u8d1f\u503c, \u9ed8\u8ba4\u503c 0
-\u6ce8\u610f\uff1a\u76ee\u524d\u5728 `<image>` \u548c `<text>` \u7ec4\u4ef6\u4e0a\u5c1a\u65e0\u6cd5\u53ea\u5b9a\u4e49\u4e00\u4e2a\u6216\u51e0\u4e2a\u89d2\u7684 `border-radius`\u3002\u6bd4\u5982\u4f60\u65e0\u6cd5\u5728\u8fd9\u4e24\u4e2a\u7ec4\u4ef6\u4e0a\u4f7f\u7528 `border-top-left-radius`\u3002
+\u6ce8\u610f\uff1a\u76ee\u524d\u5728 `<image>` \u7ec4\u4ef6\u4e0a\u5c1a\u65e0\u6cd5\u53ea\u5b9a\u4e49\u4e00\u4e2a\u6216\u51e0\u4e2a\u89d2\u7684 `border-radius`\u3002\u6bd4\u5982\u4f60\u65e0\u6cd5\u5728\u8fd9\u4e24\u4e2a\u7ec4\u4ef6\u4e0a\u4f7f\u7528 `border-top-left-radius`\u3002\u8be5\u7ea6\u675f\u53ea\u5bf9iOS\u751f\u6548\uff0cAndroid\u5e76\u4e0d\u53d7\u6b64\u9650\u5236\u3002
Weex \u76d2\u6a21\u578b\u7684 `box-sizing` \u9ed8\u8ba4\u4e3a `border-box`\uff0c\u5373\u76d2\u5b50\u7684\u5bbd\u9ad8\u5305\u542b\u5185\u5bb9\u3001\u5185\u8fb9\u8ddd\u548c\u8fb9\u6846\u7684\u5bbd\u5ea6\uff0c\u4e0d\u5305\u542b\u5916\u8fb9\u8ddd\u7684\u5bbd\u5ea6\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/687f3b14/doc/source/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/references/common-style.md b/doc/source/references/common-style.md
index 6cae589..14da29b 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -36,7 +36,6 @@ you can use the definition below in weex box model.
- `border-right-style`: values `solid` | `dashed` | `dotted`, default value `solid`
- `border-bottom-style`: values `solid` | `dashed` | `dotted`, default value `solid`
- `border-width`: `length` type, non-negative, default value `0`
- **DO NOT** use `border-width:1`. There is a default viewport `<viewport width="750">`, if the actual width of a device is 720px, then `border-width:1` will be `border-width:0.96`. As weex **do not** support sub-pixel, this border would not be rendered.
- `border-left-width`: `length` type, non-negative, default value `0`
- `border-top-width`: `length` type, non-negative, default value `0`
- `border-right-width`: `length` type, non-negative, default value `0`
@@ -54,7 +53,7 @@ you can use the definition below in weex box model.
- `border-top-left-radius`: `length` type, non-negative, default value `0`
- `border-top-right-radius`: `length` type, non-negative, default value `0`
-Notes: The rule of border-radius for a specific corner such as `border-top-left-radius` is not currently supported for component `<image>` and `<text>`.
+Notes: The rule of border-radius for a specific corner such as `border-top-left-radius` is not currently supported for component `<image>`in iOS. This only happens to iOS, it works fine on Android.
Weex box model uses `border-box` as the default value of `box-sizing`, meaning the width and height properties includes content, padding and border, but not the margin.
[34/50] incubator-weex git commit: * [website] Fixed the order of
docs.
Posted by cx...@apache.org.
* [website] Fixed the order of docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/38dc38d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/38dc38d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/38dc38d6
Branch: refs/heads/0.11-dev
Commit: 38dc38d641dda4c5923da5279cecb8ef75434c1a
Parents: 6ae6840
Author: Jinjiang <zh...@me.com>
Authored: Fri Mar 10 18:20:32 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Fri Mar 10 18:20:32 2017 +0800
----------------------------------------------------------------------
doc/source/guide/intro/app-architecture.md | 2 +-
doc/source/guide/intro/how-it-works.md | 2 +-
doc/source/guide/intro/index.md | 2 +-
doc/source/guide/intro/page-architecture.md | 2 +-
doc/source/guide/intro/using-vue.md | 2 +-
doc/source/guide/intro/web-dev-experience.md | 2 +-
doc/source/guide/intro/write-once.md | 2 +-
doc/source/guide/tools/devtools.md | 4 ++--
doc/source/guide/tools/index.md | 4 ++--
doc/source/guide/tools/weexpack.md | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/app-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/app-architecture.md b/doc/source/guide/intro/app-architecture.md
index 5dd1e1f..d7b3bc6 100644
--- a/doc/source/guide/intro/app-architecture.md
+++ b/doc/source/guide/intro/app-architecture.md
@@ -1,7 +1,7 @@
---
title: Mobile App Architecture
type: guide
-order: 5.5
+order: 4.5
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/how-it-works.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/how-it-works.md b/doc/source/guide/intro/how-it-works.md
index e66ead8..f67f8b4 100644
--- a/doc/source/guide/intro/how-it-works.md
+++ b/doc/source/guide/intro/how-it-works.md
@@ -1,7 +1,7 @@
---
title: How it works
type: guide
-order: 5.1
+order: 4.1
has_chapter_content: false
chapter_title: Intro
version: 2.1
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/index.md b/doc/source/guide/intro/index.md
index 54117fc..24c8236 100644
--- a/doc/source/guide/intro/index.md
+++ b/doc/source/guide/intro/index.md
@@ -1,7 +1,7 @@
---
title: Intro
type: guide
-order: 5
+order: 4
has_chapter_content: false
chapter_title: Intro
version: 2.1
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/page-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/page-architecture.md b/doc/source/guide/intro/page-architecture.md
index 77085f9..a9d8014 100644
--- a/doc/source/guide/intro/page-architecture.md
+++ b/doc/source/guide/intro/page-architecture.md
@@ -1,7 +1,7 @@
---
title: Weex Page Architecture
type: guide
-order: 5.6
+order: 4.6
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/using-vue.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/using-vue.md b/doc/source/guide/intro/using-vue.md
index 0f08498..9d981ee 100644
--- a/doc/source/guide/intro/using-vue.md
+++ b/doc/source/guide/intro/using-vue.md
@@ -1,7 +1,7 @@
---
title: Using Vue
type: guide
-order: 5.3
+order: 4.3
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/web-dev-experience.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/web-dev-experience.md b/doc/source/guide/intro/web-dev-experience.md
index c24c8cc..81d0ff2 100644
--- a/doc/source/guide/intro/web-dev-experience.md
+++ b/doc/source/guide/intro/web-dev-experience.md
@@ -1,7 +1,7 @@
---
title: Web Dev Experience
type: guide
-order: 5.2
+order: 4.2
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/intro/write-once.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/write-once.md b/doc/source/guide/intro/write-once.md
index 9507d21..382b7b4 100644
--- a/doc/source/guide/intro/write-once.md
+++ b/doc/source/guide/intro/write-once.md
@@ -1,7 +1,7 @@
---
title: Write once, Run Everywhere
type: guide
-order: 5.4
+order: 4.4
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/tools/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/devtools.md b/doc/source/guide/tools/devtools.md
index 9fd9de3..24d2d07 100644
--- a/doc/source/guide/tools/devtools.md
+++ b/doc/source/guide/tools/devtools.md
@@ -1,7 +1,7 @@
---
title: Using Devtools
type: guide
-order: 4.1
+order: 5.1
version: 2.1
---
@@ -97,4 +97,4 @@ use -e to set the entry of these bundles. and the url of "index.we" will display
* Android
* See the doc [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), it will lead you to config and use it step by step.
* IOS
- * See the doc [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), it will lead you to config and use it step by step.
\ No newline at end of file
+ * See the doc [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), it will lead you to config and use it step by step.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/index.md b/doc/source/guide/tools/index.md
index 8a2de8e..ca087b1 100644
--- a/doc/source/guide/tools/index.md
+++ b/doc/source/guide/tools/index.md
@@ -1,11 +1,11 @@
---
title: Tools
type: guide
-order: 4
+order: 5
version: 2.1
---
# Tools
- [Devtools](./devtools.html)
-- [Weexpack](./weexpack.html)
\ No newline at end of file
+- [Weexpack](./weexpack.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38dc38d6/doc/source/guide/tools/weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/weexpack.md b/doc/source/guide/tools/weexpack.md
index dd0ee36..e3cfdbf 100644
--- a/doc/source/guide/tools/weexpack.md
+++ b/doc/source/guide/tools/weexpack.md
@@ -1,7 +1,7 @@
---
title: Using Weexpack
type: guide
-order: 4.2
+order: 5.2
version: 2.1
---
[37/50] incubator-weex git commit: Merge branch 'doc-fix-typo' of
https://github.com/DoranYun/incubator-weex into dev This closes #86
Posted by cx...@apache.org.
Merge branch 'doc-fix-typo' of https://github.com/DoranYun/incubator-weex into dev
This closes #86
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ba3ed786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ba3ed786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ba3ed786
Branch: refs/heads/0.11-dev
Commit: ba3ed786c1550ad73377f61fd1e4108c0edb2319
Parents: e3cd711 80e7b8c
Author: Jinjiang <zh...@me.com>
Authored: Mon Mar 13 11:43:21 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Mon Mar 13 11:43:21 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/a.md | 19 -------------------
doc/source/cn/references/components/div.md | 10 +++++-----
doc/source/cn/references/components/image.md | 16 ++++++++--------
doc/source/cn/references/components/indicator.md | 3 ++-
doc/source/cn/references/components/list.md | 4 ----
doc/source/cn/references/modules/globalevent.md | 2 +-
doc/source/cn/references/path.md | 2 +-
.../cn/v-0.10/references/modules/globalevent.md | 2 +-
doc/source/references/components/image.md | 5 ++---
doc/source/references/modules/globalevent.md | 2 +-
.../v-0.10/references/modules/globalevent.md | 2 +-
11 files changed, 22 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
[08/50] incubator-weex git commit: * [doc] Add doc for scroller,
which exists in
https://github.com/alibaba/weex/blob/doc/doc/components/scroller.md#attributes
, and disappears for a reason that no one knows.
Posted by cx...@apache.org.
* [doc] Add doc for scroller, which exists in https://github.com/alibaba/weex/blob/doc/doc/components/scroller.md#attributes , and disappears for a reason that no one knows.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6dc87a74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6dc87a74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6dc87a74
Branch: refs/heads/0.11-dev
Commit: 6dc87a74fabb014f08e2e7dccd501bbf51e5e4d1
Parents: 18aa8f0
Author: YorkShen <sh...@gmail.com>
Authored: Thu Mar 2 17:00:44 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Mar 2 17:00:44 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/scroller.md | 4 ++++
doc/source/references/components/scroller.md | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6dc87a74/doc/source/cn/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/scroller.md b/doc/source/cn/references/components/scroller.md
index 4bb9f4b..694ce87 100644
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@ -33,6 +33,10 @@ version: 2.1
- `show-scrollbar {boolean}`\uff1a\u53ef\u9009\u503c\u4e3a `true`/ `false`\uff0c\u9ed8\u8ba4\u503c\u4e3a `true`\u3002\u63a7\u5236\u662f\u5426\u51fa\u73b0\u6eda\u52a8\u6761\u3002
- `scroll-direction {string}`\uff1a\u53ef\u9009\u4e3a `horizontal` \u6216\u8005 `vertical`\uff0c\u9ed8\u8ba4\u503c\u4e3a `vertical` \u3002\u5b9a\u4e49\u6eda\u52a8\u7684\u65b9\u5411\u3002
+ - `scroll-direction`\u5b9a\u4e49\u4e86scroller\u7684\u6eda\u52a8\u65b9\u5411\uff0c`flex-direction`\u5b9a\u4e49\u4e86scroller\u7684\u5e03\u5c40\u65b9\u5411\uff0c\u4e24\u4e2a\u65b9\u5411\u5fc5\u987b\u4e00\u81f4\u3002
+ - `scroll-direction`\u7684\u9ed8\u8ba4\u503c\u662f`vertical`,`flex-direction`\u7684\u9ed8\u8ba4\u503c\u662f`row`\u3002
+ - \u5f53\u9700\u8981\u4e00\u4e2a\u6c34\u5e73\u65b9\u5411\u7684scroller\u65f6\uff0c\u4f7f\u7528`scroll-direction:horizontal`\u548c`flex-direction: row`\u3002
+ - \u5f53\u9700\u8981\u4e00\u4e2a\u7ad6\u76f4\u65b9\u5411\u7684scroller\u65f6\uff0c\u4f7f\u7528`scroll-direction:vertical`\u548c`flex-direction: column`\u3002\u7531\u4e8e\u8fd9\u4e24\u4e2a\u503c\u5747\u662f\u9ed8\u8ba4\u503c\uff0c\u5f53\u9700\u8981\u4e00\u4e2a\u7ad6\u76f4\u65b9\u5411\u7684scroller\u65f6\uff0c\u8fd9\u4e24\u4e2a\u503c\u53ef\u4ee5\u4e0d\u8bbe\u7f6e\u3002
- `loadmoreoffset {number}`\uff1a\u9ed8\u8ba4\u503c\u4e3a 0\uff0c\u89e6\u53d1 `loadmore` \u4e8b\u4ef6\u6240\u9700\u8981\u7684\u5782\u76f4\u504f\u79fb\u8ddd\u79bb\uff08\u8bbe\u5907\u5c4f\u5e55\u5e95\u90e8\u4e0e\u9875\u9762\u5e95\u90e8\u4e4b\u95f4\u7684\u8ddd\u79bb\uff09\u3002\u5f53\u9875\u9762\u7684\u6eda\u52a8\u6761\u6eda\u52a8\u5230\u8db3\u591f\u63a5\u8fd1\u9875\u9762\u5e95\u90e8\u65f6\u5c06\u4f1a\u89e6\u53d1 `loadmore` \u8fd9\u4e2a\u4e8b\u4ef6\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6dc87a74/doc/source/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/scroller.md b/doc/source/references/components/scroller.md
index 1b65907..2f637d0 100644
--- a/doc/source/references/components/scroller.md
+++ b/doc/source/references/components/scroller.md
@@ -27,6 +27,10 @@ And there are two special components that can only be used inside scroller compo
* show-scrollbar: true/false whether show the scroll bar or not, default value is true
* scroll-direction: <string> define 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 .
+ * 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 thoes 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 of the list view. 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.
* loadmoreretry : <number> default value 0\uff0cwhether to reset loadmore related UI when loadmore failed, will be deprecated in further release.
[46/50] incubator-weex git commit: * [ios] public a component header
file
Posted by cx...@apache.org.
* [ios] public a component header file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3a1cc070
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3a1cc070
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3a1cc070
Branch: refs/heads/0.11-dev
Commit: 3a1cc0704674a3aaf1f24b2286ce34d7c941b601
Parents: f2241ff
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 17 21:54:51 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 17 21:54:51 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3a1cc070/ios/sdk/WeexSDK/Sources/WeexSDK.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index fb88177..2f826b2 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -43,6 +43,7 @@
#import "WXBaseViewController.h"
#import "WXAppMonitorProtocol.h"
#import "WXAppConfiguration.h"
+#import "WXAComponent.h"
#import "NSObject+WXSwizzle.h"
#import "Layout.h"
[23/50] incubator-weex git commit: * [ios] remove dlsym for jscore
garbage Collection
Posted by cx...@apache.org.
* [ios] remove dlsym for jscore garbage Collection
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2d7b8682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2d7b8682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2d7b8682
Branch: refs/heads/0.11-dev
Commit: 2d7b86823d18923a46b5c784ff9928dd8b2e63d7
Parents: 1e4105f
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 10 11:24:54 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 10 11:24:54 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2d7b8682/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
index 1ebfa6b..593ed27 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
@@ -211,15 +211,15 @@ typedef void (*WXJSCGarbageCollect)(JSContextRef);
- (void)garbageCollect
{
// for dev and debug only!!
- char str[80];
- strcpy(str, "JSSynchron");
- strcat(str, "ousGarbageColl");
- strcat(str, "ectForDebugging");
- WXJSCGarbageCollect garbageCollect = dlsym(RTLD_DEFAULT, str);
-
- if (garbageCollect != NULL) {
- garbageCollect(_jsContext.JSGlobalContextRef);
- }
+// char str[80];
+// strcpy(str, "JSSynchron");
+// strcat(str, "ousGarbageColl");
+// strcat(str, "ectForDebugging");
+// WXJSCGarbageCollect garbageCollect = dlsym(RTLD_DEFAULT, str);
+//
+// if (garbageCollect != NULL) {
+// garbageCollect(_jsContext.JSGlobalContextRef);
+// }
}
#pragma mark - Private
[20/50] incubator-weex git commit: * [website] Re-ordered the guide
content: intro up & tools down.
Posted by cx...@apache.org.
* [website] Re-ordered the guide content: intro up & tools down.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1543a5c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1543a5c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1543a5c9
Branch: refs/heads/0.11-dev
Commit: 1543a5c94ec6b8b3e1cbfdc17bd38bbd36371892
Parents: ca43fa3
Author: Jinjiang <zh...@me.com>
Authored: Fri Mar 10 10:17:29 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Fri Mar 10 10:17:29 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/intro/app-architecture.md | 2 +-
doc/source/cn/guide/intro/how-it-works.md | 2 +-
doc/source/cn/guide/intro/index.md | 4 ++--
doc/source/cn/guide/intro/page-architecture.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/web-dev-experience.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 4 ++--
doc/source/cn/guide/tools/devtools.md | 2 +-
doc/source/cn/guide/tools/index.md | 4 ++--
doc/source/cn/guide/tools/weexpack.md | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/app-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/app-architecture.md b/doc/source/cn/guide/intro/app-architecture.md
index 22fc35c..a3f39ce 100644
--- a/doc/source/cn/guide/intro/app-architecture.md
+++ b/doc/source/cn/guide/intro/app-architecture.md
@@ -1,7 +1,7 @@
---
title: \u7528 Weex \u6784\u5efa\u79fb\u52a8\u5e94\u7528
type: guide
-order: 5.5
+order: 4.5
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/how-it-works.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/how-it-works.md b/doc/source/cn/guide/intro/how-it-works.md
index 51319e1..4480005 100644
--- a/doc/source/cn/guide/intro/how-it-works.md
+++ b/doc/source/cn/guide/intro/how-it-works.md
@@ -1,7 +1,7 @@
---
title: \u5de5\u4f5c\u539f\u7406
type: guide
-order: 5.1
+order: 4.1
has_chapter_content: false
chapter_title: \u4f18\u52bf\u4ecb\u7ecd
version: 2.1
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/index.md b/doc/source/cn/guide/intro/index.md
index 90e01a4..7040c1b 100644
--- a/doc/source/cn/guide/intro/index.md
+++ b/doc/source/cn/guide/intro/index.md
@@ -1,7 +1,7 @@
---
title: \u4ecb\u7ecd
type: guide
-order: 5
+order: 4
version: 2.1
---
@@ -12,4 +12,4 @@ version: 2.1
- [\u4f7f\u7528 Vue \u5f00\u53d1 Weex \u9875\u9762](./using-vue.html)
- [\u4e00\u6b21\u64b0\u5199\uff0c\u591a\u7aef\u8fd0\u884c](./write-once.html)
- [\u7528 Weex \u6784\u5efa\u79fb\u52a8\u5e94\u7528](./app-architecture.html)
-- [Weex \u9875\u9762\u7ed3\u6784](./page-architecture.html)
\ No newline at end of file
+- [Weex \u9875\u9762\u7ed3\u6784](./page-architecture.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/page-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/page-architecture.md b/doc/source/cn/guide/intro/page-architecture.md
index 17b7d16..296ee98 100644
--- a/doc/source/cn/guide/intro/page-architecture.md
+++ b/doc/source/cn/guide/intro/page-architecture.md
@@ -1,7 +1,7 @@
---
title: Weex \u9875\u9762\u7ed3\u6784
type: guide
-order: 5.6
+order: 4.6
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/using-vue.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/using-vue.md b/doc/source/cn/guide/intro/using-vue.md
index 42ad984..3083340 100644
--- a/doc/source/cn/guide/intro/using-vue.md
+++ b/doc/source/cn/guide/intro/using-vue.md
@@ -1,7 +1,7 @@
---
title: \u4f7f\u7528 Vue \u5f00\u53d1 Weex \u9875\u9762
type: guide
-order: 5.3
+order: 4.3
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/web-dev-experience.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/web-dev-experience.md b/doc/source/cn/guide/intro/web-dev-experience.md
index d7f6163..03d33e4 100644
--- a/doc/source/cn/guide/intro/web-dev-experience.md
+++ b/doc/source/cn/guide/intro/web-dev-experience.md
@@ -1,7 +1,7 @@
---
title: Web \u5f00\u53d1\u4f53\u9a8c
type: guide
-order: 5.2
+order: 4.2
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/intro/write-once.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/write-once.md b/doc/source/cn/guide/intro/write-once.md
index e880f48..d483c5b 100644
--- a/doc/source/cn/guide/intro/write-once.md
+++ b/doc/source/cn/guide/intro/write-once.md
@@ -1,7 +1,7 @@
---
title: \u4e00\u6b21\u64b0\u5199\uff0c\u591a\u7aef\u8fd0\u884c
type: guide
-order: 5.4
+order: 4.4
version: 2.1
---
@@ -22,4 +22,4 @@ Weex \u63d0\u4f9b\u4e86\u591a\u7aef\u4e00\u81f4\u7684\u6280\u672f\u65b9\u6848\u3002
3. \u5404\u7aef\u4e0d\u4e00\u81f4\u7684\u4e1a\u52a1\u63cf\u8ff0\u4e5f\u662f\u96be\u514d\u7684\uff0c\u6211\u4eec\u901a\u8fc7\u63d0\u4f9b\u66f4\u591a\u66f4\u4e30\u5bcc\u7684\u73af\u5883\u53d8\u91cf\u6765\u5e2e\u52a9\u5f00\u53d1\u8005\u5728\u540c\u4e00\u5957\u4ee3\u7801\u91cc\u9ad8\u6548\u9002\u914d\u4e0d\u540c\u7684\u8bbe\u5907\u573a\u666f\u3002
3. \u6211\u4eec\u76f8\u4fe1\u6807\u51c6\u548c\u89c4\u8303\u7684\u529b\u91cf
-\u90e8\u5206\u529f\u80fd\u7279\u6027\u7531\u4e8e native \u7279\u6027\u7684\u5173\u7cfb\uff0c\u4f1a\u7565\u6709\u4e0d\u540c\uff0c\u6211\u4eec\u4f1a\u5728\u76f8\u5e94\u7684\u7ec4\u4ef6\u3001\u6a21\u5757\u3001API \u6587\u6863\u4e2d\u505a\u76f8\u5e94\u7684\u63cf\u8ff0\u548c\u63d0\u793a\u3002
\ No newline at end of file
+\u90e8\u5206\u529f\u80fd\u7279\u6027\u7531\u4e8e native \u7279\u6027\u7684\u5173\u7cfb\uff0c\u4f1a\u7565\u6709\u4e0d\u540c\uff0c\u6211\u4eec\u4f1a\u5728\u76f8\u5e94\u7684\u7ec4\u4ef6\u3001\u6a21\u5757\u3001API \u6587\u6863\u4e2d\u505a\u76f8\u5e94\u7684\u63cf\u8ff0\u548c\u63d0\u793a\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/tools/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/devtools.md b/doc/source/cn/guide/tools/devtools.md
index f1c4dbc..7e56161 100644
--- a/doc/source/cn/guide/tools/devtools.md
+++ b/doc/source/cn/guide/tools/devtools.md
@@ -1,7 +1,7 @@
---
title: \u4f7f\u7528 Devtools
type: guide
-order: 4.1
+order: 5.1
version: 2.1
has_chapter_content: true
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/index.md b/doc/source/cn/guide/tools/index.md
index a9c5a26..b570faa 100644
--- a/doc/source/cn/guide/tools/index.md
+++ b/doc/source/cn/guide/tools/index.md
@@ -1,11 +1,11 @@
---
title: \u5468\u8fb9\u5de5\u5177
type: guide
-order: 4
+order: 5
version: 2.1
---
# \u5468\u8fb9\u5de5\u5177
- [Devtools](./devtools.html)
-- [Weexpack](./weexpack.html)
\ No newline at end of file
+- [Weexpack](./weexpack.html)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1543a5c9/doc/source/cn/guide/tools/weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/weexpack.md b/doc/source/cn/guide/tools/weexpack.md
index ee1a26c..d570e4a 100644
--- a/doc/source/cn/guide/tools/weexpack.md
+++ b/doc/source/cn/guide/tools/weexpack.md
@@ -1,7 +1,7 @@
---
title: \u4f7f\u7528 Weexpack
type: guide
-order: 4.2
+order: 5.2
version: 2.1
---
[07/50] incubator-weex git commit: * [android] Android support emoji
now.
Posted by cx...@apache.org.
* [android] Android support emoji now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9086af4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9086af4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9086af4a
Branch: refs/heads/0.11-dev
Commit: 9086af4a0564e475de266a0020adf6ec1511064f
Parents: ba53882
Author: YorkShen <sh...@gmail.com>
Authored: Thu Mar 2 11:10:06 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Mar 2 11:50:19 2017 +0800
----------------------------------------------------------------------
doc/source/cn/faq.md | 4 ----
doc/source/faq.md | 3 ---
2 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9086af4a/doc/source/cn/faq.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/faq.md b/doc/source/cn/faq.md
index 6ef3f75..871a857 100644
--- a/doc/source/cn/faq.md
+++ b/doc/source/cn/faq.md
@@ -82,10 +82,6 @@ modal.toast({message: 'hello'})
`overflow` \u6837\u5f0f\u5728 Android \u9ed8\u8ba4\u4e3a `hidden` \u5e76\u4e14\u65e0\u6cd5\u4fee\u6539\uff0c\u539f\u56e0\u662f Android View framework \u9650\u5236\u3002\u8fd9\u4e2a\u95ee\u9898\u53ea\u51fa\u73b0\u5728 Android \u7aef\uff0ciOS \u7aef\u548c H5 \u6b63\u5e38\u3002
-## Android \u4e0d\u652f\u6301 emoji
-
-\u7531\u4e8e Android NDK \u4ec5\u652f\u6301 Modified UTF-8\uff0c\u56e0\u6b64\u4e0d\u652f\u6301 emoji\u3002Android 6.0 \u4ee5\u4e0b\u4f7f\u7528 emoji \u53ef\u80fd\u4f1a\u5bfc\u81f4\u5d29\u6e83\uff0c\u5728 Android 6.0 \u4ee5\u4e0a\u5219\u53ef\u80fd\u51fa\u73b0\u610f\u5916\u7684\u884c\u4e3a\u3002\u53ea\u80fd\u4f7f\u7528 Modified UTF-8\uff0c**\u4e0d\u8981\u4f7f\u7528 emoji**\u3002
-
## \u5982\u4f55\u53d6\u6d88 750 \u50cf\u7d20\u81ea\u9002\u5e94\u5e76\u4ee5\u5bbd\u9ad8\u6bd4\u8ba1\u7b97\u771f\u5b9e\u50cf\u7d20\uff1f
`this.$getConfig()` \u65b9\u6cd5\u4f1a\u8fd4\u56de\u4e00\u4e2a\u5bf9\u8c61\uff0c\u8fd9\u4e2a\u5bf9\u8c61\u7684 `deviceHeight` \u548c `deviceWidth` \u5c5e\u6027\u5373\u5b9e\u9645\u8bbe\u5907\u5bbd\u5ea6/\u9ad8\u5ea6\uff08\u4ee5\u50cf\u7d20\u4e3a\u5355\u4f4d\uff09\uff0c\u800c\u4e0d\u662f\u4ee5 750 \u9002\u914d\u7684\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9086af4a/doc/source/faq.md
----------------------------------------------------------------------
diff --git a/doc/source/faq.md b/doc/source/faq.md
index d3e5ea2..4c21d20 100644
--- a/doc/source/faq.md
+++ b/doc/source/faq.md
@@ -75,9 +75,6 @@ We will bring a better syntax design in the future.
## Android only support `overflow:hidden`
The `overflow` style in android is `hidden` and cannot be changed. This is the result of Android View framework. This only happens on Android, iOS will work as expected.
-## Android do not support emoji
-As Android NDK only supports Modified UTF-8, emoji is not support yet. Any attemp to use emoji may cause crash in case of lower than Android 6.0, and unexpected behavior when it is higher than 6.0. Only use Modified UTF-8, **do not** use emoji.
-
## How to get rid of 750 adaption and calculate width/height in real pixels\uff1f
The deviceHeight and deviceWidth got in `this.$getConfig()` is the real device width/height in pixels, not the ones with 750-adapted.
[04/50] incubator-weex git commit: Merge branch 'dev' of
github.com:alibaba/weex into dev
Posted by cx...@apache.org.
Merge branch 'dev' of github.com:alibaba/weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ba53882d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ba53882d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ba53882d
Branch: refs/heads/0.11-dev
Commit: ba53882da021a37106c362bb49cba87bf36cb6fe
Parents: de4286a 4733936
Author: sospartan <so...@gmail.com>
Authored: Thu Mar 2 11:30:46 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Thu Mar 2 11:30:46 2017 +0800
----------------------------------------------------------------------
examples/module/websocket-demo.we | 88 ++++++++++++----------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 16 +++-
3 files changed, 64 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[05/50] incubator-weex git commit: * [doc] Add document for behavior
of border-radius clipping.
Posted by cx...@apache.org.
* [doc] Add document for behavior of border-radius clipping.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/18aa8f02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/18aa8f02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/18aa8f02
Branch: refs/heads/0.11-dev
Commit: 18aa8f027fbaabdf486da41a560077b880b5dc49
Parents: 687f3b1
Author: YorkShen <sh...@gmail.com>
Authored: Thu Mar 2 11:48:49 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Mar 2 11:50:19 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/common-style.md | 11 +++++++++--
doc/source/references/common-style.md | 15 ++++++++++-----
2 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18aa8f02/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/common-style.md b/doc/source/cn/references/common-style.md
index 96f6d9d..033a45c 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -90,10 +90,17 @@ Weex \u5bf9\u4e8e\u957f\u5ea6\u503c\u76ee\u524d\u53ea\u652f\u6301*\u50cf\u7d20*\u503c\uff0c\u4e0d\u652f\u6301\u76f8\u5bf9\u5355\u4f4d\uff08`em`\u3001
- `border-top-right-radius {length}`\uff1a\uff0c\u975e\u8d1f\u503c, \u9ed8\u8ba4\u503c 0
-\u6ce8\u610f\uff1a\u76ee\u524d\u5728 `<image>` \u7ec4\u4ef6\u4e0a\u5c1a\u65e0\u6cd5\u53ea\u5b9a\u4e49\u4e00\u4e2a\u6216\u51e0\u4e2a\u89d2\u7684 `border-radius`\u3002\u6bd4\u5982\u4f60\u65e0\u6cd5\u5728\u8fd9\u4e24\u4e2a\u7ec4\u4ef6\u4e0a\u4f7f\u7528 `border-top-left-radius`\u3002\u8be5\u7ea6\u675f\u53ea\u5bf9iOS\u751f\u6548\uff0cAndroid\u5e76\u4e0d\u53d7\u6b64\u9650\u5236\u3002
-
+### \u6ce8\u610f\uff1a
Weex \u76d2\u6a21\u578b\u7684 `box-sizing` \u9ed8\u8ba4\u4e3a `border-box`\uff0c\u5373\u76d2\u5b50\u7684\u5bbd\u9ad8\u5305\u542b\u5185\u5bb9\u3001\u5185\u8fb9\u8ddd\u548c\u8fb9\u6846\u7684\u5bbd\u5ea6\uff0c\u4e0d\u5305\u542b\u5916\u8fb9\u8ddd\u7684\u5bbd\u5ea6\u3002
+\u76ee\u524d\u5728 `<image>` \u7ec4\u4ef6\u4e0a\u5c1a\u65e0\u6cd5\u53ea\u5b9a\u4e49\u4e00\u4e2a\u6216\u51e0\u4e2a\u89d2\u7684 `border-radius`\u3002\u6bd4\u5982\u4f60\u65e0\u6cd5\u5728\u8fd9\u4e24\u4e2a\u7ec4\u4ef6\u4e0a\u4f7f\u7528 `border-top-left-radius`\u3002\u8be5\u7ea6\u675f\u53ea\u5bf9iOS\u751f\u6548\uff0cAndroid\u5e76\u4e0d\u53d7\u6b64\u9650\u5236\u3002
+
+\u5c3d\u7ba1 `overflow:hidden` \u5728android\u4e0a\u662f\u9ed8\u8ba4\u884c\u4e3a\uff0c\u4f46\u53ea\u6709\u4e0b\u5217\u6761\u4ef6\u90fd\u6ee1\u8db3\u65f6\uff0c\u4e00\u4e2a\u7236view\u624d\u4f1a\u53bbclip\u5b83\u7684\u5b50view\u3002\u8fd9\u4e2a\u9650\u5236\u53ea\u5bf9Android\u751f\u6548\uff0ciOS\u4e0d\u53d7\u5f71\u54cd\u3002
+* \u7236view\u662f`div`, `a`, `cell`, `refresh` \u6216 `loading`\u3002
+* \u7cfb\u7edf\u7248\u672c\u662fAndroid 4.3\u6216\u66f4\u9ad8\u3002
+* \u7cfb\u7edf\u7248\u672c\u4e0d\u662fAndorid 7.0\u3002
+* \u7236view\u6ca1\u6709`background-image`\u5c5e\u6027\u6216\u7cfb\u7edf\u7248\u672c\u662fAndroid 5.0\u6216\u66f4\u9ad8\u3002
+
### \u793a\u4f8b\uff1a
```html
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18aa8f02/doc/source/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/references/common-style.md b/doc/source/references/common-style.md
index 14da29b..24fac44 100644
--- a/doc/source/references/common-style.md
+++ b/doc/source/references/common-style.md
@@ -46,18 +46,23 @@ you can use the definition below in weex box model.
- `border-right-color`: `color` type, default value `#000000`
- `border-bottom-color`: `color` type, default value `#000000`
- `border-radius`: `length` type, default value `0`, (rounded borders to elements , default value is 0 meaning right angle )
-
- Although the the default overflow style is `overflow:hidden` in android, a view will not be clipped by its parents' `border-radius`. This only happens on Android, it works fine on iOS.
- `border-bottom-left-radius`: `length` type, non-negative, default value `0`
- `border-bottom-right-radius`: `length` type, non-negative, default value `0`
- `border-top-left-radius`: `length` type, non-negative, default value `0`
- `border-top-right-radius`: `length` type, non-negative, default value `0`
-Notes: The rule of border-radius for a specific corner such as `border-top-left-radius` is not currently supported for component `<image>`in iOS. This only happens to iOS, it works fine on Android.
-
+### Notes
Weex box model uses `border-box` as the default value of `box-sizing`, meaning the width and height properties includes content, padding and border, but not the margin.
-example:
+The rule of border-radius for a specific corner such as `border-top-left-radius` is not currently supported for component `<image>`in iOS. This only happens to iOS, it works fine on Android.
+
+Although `overflow:hidden` is default on android, a view **will not** clip its children according to `border-radius` unless all the following condtions met. This only happens on Android, it works fine on iOS.
+* The view type is `div`, `a`, `cell`, `refresh` or `loading`.
+* OS version is Android 4.3 or higher.
+* OS version is **not** Andorid 7.0
+* A view **does not** have `background-image` property nor OS version is Android 5.0 or higher.
+
+### Example
```html
<template>
[22/50] incubator-weex git commit: * [ios] fix default handler
override
Posted by cx...@apache.org.
* [ios] fix default handler override
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1e4105f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1e4105f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1e4105f6
Branch: refs/heads/0.11-dev
Commit: 1e4105f633693b26f7d73b818418ce643040de60
Parents: ca43fa3
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 10 11:23:47 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 10 11:23:47 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e4105f6/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index e804aea..dfbdb1b 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -217,9 +217,14 @@
+ (void)registerDefaults
{
- [self _registerDefaultComponents];
- [self _registerDefaultModules];
- [self _registerDefaultHandlers];
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ [self _registerDefaultComponents];
+ [self _registerDefaultModules];
+ [self _registerDefaultHandlers];
+ });
+
+ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"taobao://"]];
}
+ (NSString*)SDKEngineVersion
[09/50] incubator-weex git commit: * [doc] update cell doc
Posted by cx...@apache.org.
* [doc] update cell doc
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ea30e052
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ea30e052
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ea30e052
Branch: refs/heads/0.11-dev
Commit: ea30e052519270d2f13474408e76cb25b7812e27
Parents: 6dc87a7
Author: xkli <56...@qq.com>
Authored: Fri Mar 3 17:03:37 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Fri Mar 3 17:03:37 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/cell.md | 3 +++
doc/source/references/components/cell.md | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ea30e052/doc/source/cn/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/cell.md b/doc/source/cn/references/components/cell.md
index 8f90d9c..5fadf5d 100644
--- a/doc/source/cn/references/components/cell.md
+++ b/doc/source/cn/references/components/cell.md
@@ -13,6 +13,9 @@ version: 2.1
\u652f\u6301\u6240\u6709 Weex \u7684\u7ec4\u4ef6\u4f5c\u4e3a\u5b83\u7684\u5b50\u7ec4\u4ef6\u3002
+## \u5c5e\u6027
+* `keep-scroll-position`: <span class="api-version">v0.11+</span> <boolen> List \u63d2\u5165\u6570\u636e\u540e\u662f\u5426\u4fdd\u6301\u4e0a\u6b21\u6eda\u52a8\u7684\u4f4d\u7f6e
+
## \u6837\u5f0f
**\u6ce8\u610f\uff1a**
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ea30e052/doc/source/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/cell.md b/doc/source/references/components/cell.md
index 97fb7ed..38cfd9b 100644
--- a/doc/source/references/components/cell.md
+++ b/doc/source/references/components/cell.md
@@ -19,6 +19,8 @@ This type of component supports all kinds of weex component as its child compone
**Notes:** you can't give `<cell>` a `flex` value. Width of `<cell>` is equal to the width of its parent component `<list>`, and you don't need to specify its height.
+* `keep-scroll-position`: <span class="api-version">v0.11+</span> <boolen> List Whether to keep the last sliding position after inserting the Cell
+
### Styles
**common styles**: check out the [common styles](../common-style.html)
[15/50] incubator-weex git commit: * [doc] Update cn docs,
all changes are shown below:
Posted by cx...@apache.org.
* [doc] Update cn docs, all changes are shown below:
- Weex supports horizontalpan/verticalpan currently;
- weex-toolkit@release supports Vue 2.0 template;
- Fix typo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f6838783
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f6838783
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f6838783
Branch: refs/heads/0.11-dev
Commit: f683878399471b8171127983ec078cf22879328b
Parents: 9dd6bdd
Author: Yun Dong <yu...@gmail.com>
Authored: Tue Mar 7 14:31:02 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Tue Mar 7 14:31:02 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/set-up-env.md | 8 +-
doc/source/cn/guide/tools/weexpack.md | 2 +-
.../cn/references/advanced/extend-to-ios.md | 231 ++++++++++---------
doc/source/cn/references/components/cell.md | 2 +-
doc/source/cn/references/gesture.md | 3 +-
doc/source/guide/intro/devtools.md | 100 --------
doc/source/guide/set-up-env.md | 2 +-
doc/source/guide/tools/weexpack.md | 2 +
8 files changed, 131 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/cn/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md
index 79ff249..5d77a45 100644
--- a/doc/source/cn/guide/set-up-env.md
+++ b/doc/source/cn/guide/set-up-env.md
@@ -12,7 +12,7 @@ has_chapter_content: true
## \u7b2c\u4e00\u6b65\uff1a\u5b89\u88c5\u4f9d\u8d56
-Weex \u5b98\u65b9\u63d0\u4f9b\u4e86 weex-toolkit \u7684\u811a\u624b\u67b6\u5de5\u5177\u6765\u8f85\u52a9\u5f00\u53d1\u548c\u8c03\u8bd5\u3002\u9996\u5148\uff0c\u4f60\u9700\u8981 Node.js \u548c weex-toolkit\u3002
+Weex \u5b98\u65b9\u63d0\u4f9b\u4e86 weex-toolkit \u7684\u811a\u624b\u67b6\u5de5\u5177\u6765\u8f85\u52a9\u5f00\u53d1\u548c\u8c03\u8bd5\u3002\u9996\u5148\uff0c\u4f60\u9700\u8981 Node.js \u548c [Weex CLi](https://github.com/weexteam/weex-toolkit)\u3002
\u5b89\u88c5 Node.js \u65b9\u5f0f\u591a\u79cd\u591a\u6837\uff0c\u6700\u7b80\u5355\u7684\u65b9\u5f0f\u662f\u5728 [Node.js \u5b98\u7f51](https://nodejs.org/en/) \u4e0b\u8f7d\u53ef\u6267\u884c\u7a0b\u5e8f\u76f4\u63a5\u5b89\u88c5\u5373\u53ef\u3002
@@ -46,12 +46,14 @@ $ weex -v
v1.0.3
weex-builder : v0.2.4
weex-previewer : v1.3.4
-```
+```
+
\u56fd\u5185\u5f00\u53d1\u8005\u53ef\u4ee5\u8003\u8651\u4f7f\u7528\u6dd8\u5b9d\u7684 npm \u955c\u50cf \u2014\u2014 [cnpm](https://npm.taobao.org/) \u5b89\u88c5 weex-toolkit
+
```bash
-$ npm install -g cnpm
+$ npm install -g cnpm --registry=https://registry.npm.taobao.org
$ cnpm install -g weex-toolkit
```
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/cn/guide/tools/weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/weexpack.md b/doc/source/cn/guide/tools/weexpack.md
index ac64dd7..ee1a26c 100644
--- a/doc/source/cn/guide/tools/weexpack.md
+++ b/doc/source/cn/guide/tools/weexpack.md
@@ -372,7 +372,7 @@ weexplugin
## \u63d2\u4ef6\u5f00\u53d1\u6587\u6863
-+ [\u5f00\u53d1 web \u7684\u63d2\u4ef6\u6559\u7a0b](./doc/plugin-devloping-web.md)
++ [\u5f00\u53d1 web \u7684\u63d2\u4ef6\u6559\u7a0b](https://github.com/weexteam/weex-pack/blob/master/doc/plugin-devloping-web.md)
## \u793a\u4f8b
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/cn/references/advanced/extend-to-ios.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/advanced/extend-to-ios.md b/doc/source/cn/references/advanced/extend-to-ios.md
index 4edecf4..25872bb 100644
--- a/doc/source/cn/references/advanced/extend-to-ios.md
+++ b/doc/source/cn/references/advanced/extend-to-ios.md
@@ -11,119 +11,126 @@ version: 2.1
Weex SDK \u53ea\u63d0\u4f9b\u6e32\u67d3\uff0c\u800c\u4e0d\u662f\u5176\u4ed6\u7684\u80fd\u529b\uff0c\u5982\u679c\u4f60\u9700\u8981 \u50cf\u7f51\u7edc\uff0c\u56fe\u7247\uff0cURL\u8df3\u8f6c\u8fd9\u4e9b\u7279\u6027\uff0c\u9700\u8981\u81ea\u5df1\u52a8\u624b\u5b9e\u73b0\u4ed6\u4eec
\u4f8b\u5982\uff0c\u5982\u679c\u4f60\u60f3\u5b9e\u73b0\u4e00\u4e2aurl\u5730\u5740\u8df3\u8f6c\u51fd\u6570\uff0c\u4f60\u53ef\u4ee5\u6309\u7167\u5982\u4e0b\u6b65\u9aa4\u5b9e\u73b0\u4e00\u4e2a Module
-1. **\u81ea\u5b9a\u4e49module\u7684\u6b65\u9aa4**
- 1. \u81ea\u5b9a\u4e49\u7684module\u7c7b \u5fc5\u987b\u5b9e\u73b0 `WXModuleProtocol`
- 2. \u5fc5\u987b\u6dfb\u52a0\u5b8f`WX_EXPORT_METHOD`, \u5b83\u53ef\u4ee5\u88abweex\u8bc6\u522b\uff0c\u5b83\u7684\u53c2\u6570\u662f JavaScript\u8c03\u7528 module\u6307\u5b9a\u65b9\u6cd5\u7684\u53c2\u6570
- 3. \u6dfb\u52a0`@synthesized weexInstance`\uff0c\u6bcf\u4e2amoudle\u5bf9\u8c61\u88ab\u7ed1\u5b9a\u5230\u4e00\u4e2a\u6307\u5b9a\u7684\u5b9e\u4f8b\u4e0a
- 4. Module \u65b9\u6cd5\u4f1a\u5728UI\u7ebf\u7a0b\u4e2d\u88ab\u8c03\u7528\uff0c\u6240\u4ee5\u4e0d\u8981\u505a\u592a\u591a\u8017\u65f6\u7684\u4efb\u52a1\u5728\u8fd9\u91cc\uff0c\u5982\u679c\u8981\u5728\u5176\u4ed6\u7ebf\u7a0b\u6267\u884c\u6574\u4e2amodule \u65b9\u6cd5\uff0c\u9700\u8981\u5b9e\u73b0`WXModuleProtocol`\u4e2d`- (NSThread *)targetExecuteThread`\u7684\u65b9\u6cd5\uff0c\u8fd9\u6837\uff0c\u5206\u53d1\u5230\u8fd9\u4e2amodule\u7684\u4efb\u52a1\u4f1a\u5728\u6307\u5b9a\u7684\u7ebf\u7a0b\u4e2d\u8fd0\u884c
- 5. Weex \u7684\u53c2\u6570\u53ef\u4ee5\u662f String \u6216\u8005Map
- 6. Module \u652f\u6301\u8fd4\u56de\u503c\u7ed9 JavaScript\u4e2d\u7684\u56de\u8c03\uff0c\u56de\u8c03\u7684\u7c7b\u578b\u662f`WXModuleCallback`,\u56de\u8c03\u7684\u53c2\u6570\u53ef\u4ee5\u662fString\u6216\u8005Map
-
- ```object-c
- @implementation WXEventModule
- @synthesize weexInstance;
- WX_EXPORT_METHOD(@selector(openURL:callback))
- - (void)openURL:(NSString *)url callback:(WXModuleCallback)callback
- {
- NSString *newURL = url;
- if ([url hasPrefix:@"//"]) {
- newURL = [NSString stringWithFormat:@"http:%@", url];
- } else if (![url hasPrefix:@"http"]) {
- newURL = [NSURL URLWithString:url relativeToURL:weexInstance.scriptURL].absoluteString;
- }
-
- UIViewController *controller = [[WXDemoViewController alloc] init];
- ((WXDemoViewController *)controller).url = [NSURL URLWithString:newURL];
-
- [[weexInstance.viewController navigationController] pushViewController:controller animated:YES];
- callback(@{@"result":@"success"});
- }
-
- @end
- ```
-2. **Register the module**
- \u901a\u8fc7\u8c03\u7528 WXSDKEngine \u4e2d\u7684 `registerModule:withClass`\u65b9\u6cd5\u6765\u6ce8\u518c\u81ea\u5df1\u7684module
-
- ```object-c
- WXSDKEngine.h
- /**
- * @abstract Registers a module for a given name
- * @param name The module name to register
- * @param clazz The module class to register
- **/
- + (void)registerModule:(NSString *)name withClass:(Class)clazz;
- [WXSDKEngine registerModule:@"event" withClass:[WXEventModule class]];
- ```
-3. **\u4f7f\u7528\u81ea\u5df1\u7684module**
- \u8fd9\u91cc\u7684 require \u91cc\u9762\u7684event \u5c31\u662f\u5728 \u4e0a\u4e00\u6b65\u8c03\u7528`registerModule:` \u6ce8\u518cmodule \u65f6\u5019\u7684name
-
- ```javascript
- var eventModule = weex.requireModule('event');
- eventModule.openURL('url',function(ret) {
- nativeLog(ret);
- });
- ```
-
- Weex SDK\u6ca1\u6709 \u56fe\u7247\u4e0b\u8f7d\uff0cnavigation \u64cd\u4f5c\u7684\u80fd\u529b\uff0c\u8bf7\u5927\u5bb6\u81ea\u5df1\u5b9e\u73b0\u8fd9\u4e9b protocol
-
-4. **WXImgLoaderProtocol**
-
- weexSDK \u6ca1\u6709\u56fe\u7247\u4e0b\u8f7d\u7684\u80fd\u529b\uff0c\u9700\u8981\u5b9e\u73b0 WXImgLoaderProtocol,\u53c2\u8003\u4e0b\u9762\u7684\u4f8b\u5b50
-
- ```object-c
- WXImageLoaderProtocol.h
- @protocol WXImgLoaderProtocol <WXModuleProtocol>
- /**
- * @abstract Creates a image download handler with a given URL
- * @param imageUrl The URL of the image to download
- * @param imageFrame The frame of the image you want to set
- * @param options : The options to be used for this download
- * @param completedBlock : A block called once the download is completed.
- image : the image which has been download to local.
- error : the error which has happened in download.
- finished : a Boolean value indicating whether download action has finished.
- */
- -(id<WXImageOperationProtocol>)downloadImageWithURL:(NSString *)url imageFrame:(CGRect)imageFrame userInfo:(NSDictionary *)options completed:(void(^)(UIImage *image, NSError *error, BOOL finished))completedBlock;
- @end
- ```
-
- \u5b9e\u73b0\u4e0a\u8ff0\u534f\u8bae
-
- ```object-c
- @implementation WXImgLoaderDefaultImpl
- #pragma mark -
- #pragma mark WXImgLoaderProtocol
-
- - (id<WXImageOperationProtocol>)downloadImageWithURL:(NSString *)url imageFrame:(CGRect)imageFrame userInfo:(NSDictionary *)userInfo completed:(void(^)(UIImage *image, NSError *error, BOOL finished))completedBlock
- {
- if ([url hasPrefix:@"//"]) {
- url = [@"http:" stringByAppendingString:url];
- }
- return (id<WXImageOperationProtocol>)[[SDWebImageManager sharedManager] downloadImageWithURL:[NSURL URLWithString:url] options:0 progress:^(NSInteger receivedSize, NSInteger expectedSize) {
- } completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
- if (completedBlock) {
- completedBlock(image, error, finished);
- }
- }];
- }
- @end
- ```
-
-5. **handler\u6ce8\u518c**
+
+### **\u81ea\u5b9a\u4e49module\u7684\u6b65\u9aa4**
+1. \u81ea\u5b9a\u4e49\u7684module\u7c7b \u5fc5\u987b\u5b9e\u73b0 `WXModuleProtocol`
+2. \u5fc5\u987b\u6dfb\u52a0\u5b8f`WX_EXPORT_METHOD`, \u5b83\u53ef\u4ee5\u88abweex\u8bc6\u522b\uff0c\u5b83\u7684\u53c2\u6570\u662f JavaScript\u8c03\u7528 module\u6307\u5b9a\u65b9\u6cd5\u7684\u53c2\u6570
+3. \u6dfb\u52a0`@synthesized weexInstance`\uff0c\u6bcf\u4e2amoudle\u5bf9\u8c61\u88ab\u7ed1\u5b9a\u5230\u4e00\u4e2a\u6307\u5b9a\u7684\u5b9e\u4f8b\u4e0a
+4. Module \u65b9\u6cd5\u4f1a\u5728UI\u7ebf\u7a0b\u4e2d\u88ab\u8c03\u7528\uff0c\u6240\u4ee5\u4e0d\u8981\u505a\u592a\u591a\u8017\u65f6\u7684\u4efb\u52a1\u5728\u8fd9\u91cc\uff0c\u5982\u679c\u8981\u5728\u5176\u4ed6\u7ebf\u7a0b\u6267\u884c\u6574\u4e2amodule \u65b9\u6cd5\uff0c\u9700\u8981\u5b9e\u73b0`WXModuleProtocol`\u4e2d`- (NSThread *)targetExecuteThread`\u7684\u65b9\u6cd5\uff0c\u8fd9\u6837\uff0c\u5206\u53d1\u5230\u8fd9\u4e2amodule\u7684\u4efb\u52a1\u4f1a\u5728\u6307\u5b9a\u7684\u7ebf\u7a0b\u4e2d\u8fd0\u884c
+5. Weex \u7684\u53c2\u6570\u53ef\u4ee5\u662f String \u6216\u8005Map
+6. Module \u652f\u6301\u8fd4\u56de\u503c\u7ed9 JavaScript\u4e2d\u7684\u56de\u8c03\uff0c\u56de\u8c03\u7684\u7c7b\u578b\u662f`WXModuleCallback`,\u56de\u8c03\u7684\u53c2\u6570\u53ef\u4ee5\u662fString\u6216\u8005Map
+
+ ```object-c
+ @implementation WXEventModule
+ @synthesize weexInstance;
+ WX_EXPORT_METHOD(@selector(openURL:callback))
+ - (void)openURL:(NSString *)url callback:(WXModuleCallback)callback
+ {
+ NSString *newURL = url;
+ if ([url hasPrefix:@"//"]) {
+ newURL = [NSString stringWithFormat:@"http:%@", url];
+ } else if (![url hasPrefix:@"http"]) {
+ newURL = [NSURL URLWithString:url relativeToURL:weexInstance.scriptURL].absoluteString;
+ }
+
+ UIViewController *controller = [[WXDemoViewController alloc] init];
+ ((WXDemoViewController *)controller).url = [NSURL URLWithString:newURL];
+
+ [[weexInstance.viewController navigationController] pushViewController:controller animated:YES];
+ callback(@{@"result":@"success"});
+ }
+
+ @end
+ ```
+
+\u53e6\u5916\uff0c`0.10.0` \u5f00\u59cb\u652f\u6301\u540c\u6b65\u6a21\u5757 API \u8c03\u7528\uff0c\u60a8\u53ef\u4ee5\u4f7f\u7528\u5b8f `WX_EXPORT_METHOD_SYNC` \u5bfc\u51fa\u6a21\u5757\u65b9\u6cd5\uff0c\u8fd9\u4e9b\u65b9\u6cd5\u53ef\u4ee5\u4f7f JavaScript \u63a5\u53d7\u4ece native \u8fd4\u56de\u7684\u503c\uff0c\u5b83\u53ea\u80fd\u5728 JS \u7ebf\u7a0b\u88ab\u8c03\u7528\u3002
+
+### \u6ce8\u518c module
+
+\u901a\u8fc7\u8c03\u7528 WXSDKEngine \u4e2d\u7684 `registerModule:withClass`\u65b9\u6cd5\u6765\u6ce8\u518c\u81ea\u5df1\u7684module
+
+```object-c
+WXSDKEngine.h
+/**
+* @abstract Registers a module for a given name
+* @param name The module name to register
+* @param clazz The module class to register
+**/
++ (void)registerModule:(NSString *)name withClass:(Class)clazz;
+[WXSDKEngine registerModule:@"event" withClass:[WXEventModule class]];
+```
+
+### \u4f7f\u7528\u81ea\u5df1\u7684 module
+
+\u8fd9\u91cc\u7684 require \u91cc\u9762\u7684 event \u5c31\u662f\u5728 \u4e0a\u4e00\u6b65\u8c03\u7528 `registerModule:` \u6ce8\u518c module \u65f6\u5019\u7684 name
+
+```javascript
+var eventModule = weex.requireModule('event');
+eventModule.openURL('url',function(ret) {
+ nativeLog(ret);
+});
+```
+
+Weex SDK \u6ca1\u6709 \u56fe\u7247\u4e0b\u8f7d\uff0cnavigation \u64cd\u4f5c\u7684\u80fd\u529b\uff0c\u8bf7\u5927\u5bb6\u81ea\u5df1\u5b9e\u73b0\u8fd9\u4e9b protocol
+
+## WXImgLoaderProtocol
+
+weexSDK \u6ca1\u6709\u56fe\u7247\u4e0b\u8f7d\u7684\u80fd\u529b\uff0c\u9700\u8981\u5b9e\u73b0 WXImgLoaderProtocol, \u53c2\u8003\u4e0b\u9762\u7684\u4f8b\u5b50
+
+```object-c
+WXImageLoaderProtocol.h
+@protocol WXImgLoaderProtocol <WXModuleProtocol>
+/**
+* @abstract Creates a image download handler with a given URL
+* @param imageUrl The URL of the image to download
+* @param imageFrame The frame of the image you want to set
+* @param options : The options to be used for this download
+* @param completedBlock : A block called once the download is completed.
+ image : the image which has been download to local.
+ error : the error which has happened in download.
+ finished : a Boolean value indicating whether download action has finished.
+*/
+-(id<WXImageOperationProtocol>)downloadImageWithURL:(NSString *)url imageFrame:(CGRect)imageFrame userInfo:(NSDictionary *)options completed:(void(^)(UIImage *image, NSError *error, BOOL finished))completedBlock;
+@end
+```
+
+\u5b9e\u73b0\u4e0a\u8ff0\u534f\u8bae
+
+```object-c
+@implementation WXImgLoaderDefaultImpl
+#pragma mark -
+#pragma mark WXImgLoaderProtocol
+
+- (id<WXImageOperationProtocol>)downloadImageWithURL:(NSString *)url imageFrame:(CGRect)imageFrame userInfo:(NSDictionary *)userInfo completed:(void(^)(UIImage *image, NSError *error, BOOL finished))completedBlock
+{
+ if ([url hasPrefix:@"//"]) {
+ url = [@"http:" stringByAppendingString:url];
+ }
+ return (id<WXImageOperationProtocol>)[[SDWebImageManager sharedManager] downloadImageWithURL:[NSURL URLWithString:url] options:0 progress:^(NSInteger receivedSize, NSInteger expectedSize) {
+ } completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
+ if (completedBlock) {
+ completedBlock(image, error, finished);
+ }
+ }];
+}
+@end
+```
+
+### handler\u6ce8\u518c
- \u4f60\u53ef\u4ee5\u901a\u8fc7WXSDKEngine \u4e2d\u7684 `registerHandler:withProtocol`\u6ce8\u518chandler
-
- ```object-c
- WXSDKEngine.h
- /**
- * @abstract Registers a handler for a given handler instance and specific protocol
- * @param handler The handler instance to register
- * @param protocol The protocol to confirm
- */
- + (void)registerHandler:(id)handler withProtocol:(Protocol *)protocol;
-
- [WXSDKEngine registerHandler:[WXImgLoaderDefaultImpl new] withProtocol:@protocol(WXImgLoaderProtocol)]
- ```
+\u4f60\u53ef\u4ee5\u901a\u8fc7WXSDKEngine \u4e2d\u7684 `registerHandler:withProtocol`\u6ce8\u518chandler
+
+```object-c
+WXSDKEngine.h
+/**
+* @abstract Registers a handler for a given handler instance and specific protocol
+* @param handler The handler instance to register
+* @param protocol The protocol to confirm
+*/
++ (void)registerHandler:(id)handler withProtocol:(Protocol *)protocol;
+
+[WXSDKEngine registerHandler:[WXImgLoaderDefaultImpl new] withProtocol:@protocol(WXImgLoaderProtocol)]
+```
## Components \u6269\u5c55
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/cn/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/cell.md b/doc/source/cn/references/components/cell.md
index 8f90d9c..f4baaae 100644
--- a/doc/source/cn/references/components/cell.md
+++ b/doc/source/cn/references/components/cell.md
@@ -17,7 +17,7 @@ version: 2.1
**\u6ce8\u610f\uff1a**
-\u4f60\u4e0d\u80fd\u7ed9 `<cell>` \u8bbe\u5b9a`flex`\u503c\u3002 `<cell>`\u7684\u5bbd\u5ea6\u7b49\u4e8e\u7236\u7ec4\u4ef6 `<list>` \u7684\u5bbd\u5ea6\uff0c\u5e76\u4e14 `<cell>` \u9ad8\u5ea6\u81ea\u9002\u5e94\u3002
+\u7531\u4e8e `<cell>` \u672c\u8eab\u662f\u4e00\u4e2a\u5bb9\u5668\uff0c\u5176\u5e03\u5c40\u7531 `<list>` \u8fdb\u884c\u7ba1\u7406\uff0c\u4f60\u4e0d\u80fd\u7ed9 `<cell>` \u8bbe\u5b9a`flex`\u503c\u3002 `<cell>`\u7684\u5bbd\u5ea6\u7b49\u4e8e\u7236\u7ec4\u4ef6 `<list>` \u7684\u5bbd\u5ea6\uff0c\u5e76\u4e14 `<cell>` \u9ad8\u5ea6\u81ea\u9002\u5e94\uff0c\u6307\u5b9a `margin` \u6837\u5f0f\u4e5f\u4e0d\u8d77\u4f5c\u7528\u3002
- \u901a\u7528\u6837\u5f0f\uff1a\u652f\u6301\u6240\u6709\u901a\u7528\u6837\u5f0f
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/cn/references/gesture.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/gesture.md b/doc/source/cn/references/gesture.md
index f4d566d..be81e45 100644
--- a/doc/source/cn/references/gesture.md
+++ b/doc/source/cn/references/gesture.md
@@ -26,7 +26,8 @@ Weex \u5c01\u88c5\u4e86\u539f\u751f\u7684\u89e6\u6478\u4e8b\u4ef6\u4ee5\u63d0\u4f9b\u624b\u52bf\u7cfb\u7edf\u3002\u4f7f\u7528\u624b\u52bf\u7c7b\u4f3c\u4e8e
- `panstart`
- `panmove`
- `panend`
-
+ - `horizontalpan` <span class="api-version">v0.10+</span>\uff1a\u624b\u52bf\u7684 `start/move/end` \u72b6\u6001\u4fdd\u5b58\u5728 `state` \u7279\u6027\u4e2d\u3002\u76ee\u524d\u8be5\u624b\u52bf\u5728 Android \u4e0b\u4f1a\u4e0e click \u4e8b\u4ef6\u51b2\u7a81\u3002
+ - `verticalpan` <span class="api-version">v0.10+</span>\uff1a\u52bf\u7684 `start/move/end` \u72b6\u6001\u4fdd\u5b58\u5728 `state` \u7279\u6027\u4e2d\u3002\u76ee\u524d\u8be5\u624b\u52bf\u5728 Android \u4e0b\u4f1a\u4e0e click \u4e8b\u4ef6\u51b2\u7a81\u3002
- **Swipe**\uff1a`swipe` \u5c06\u4f1a\u5728\u7528\u6237\u5728\u5c4f\u5e55\u4e0a\u6ed1\u52a8\u65f6\u89e6\u53d1\uff0c\u4e00\u6b21\u8fde\u7eed\u7684\u6ed1\u52a8\u53ea\u4f1a\u89e6\u53d1\u4e00\u6b21 `swiper` \u624b\u52bf\u3002
- **LongPress**\uff1a`LongPress` \u5c06\u4f1a\u5728\u89e6\u6478\u70b9\u8fde\u7eed\u4fdd\u6301 500 ms\u4ee5\u4e0a\u65f6\u89e6\u53d1\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/guide/intro/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/devtools.md b/doc/source/guide/intro/devtools.md
deleted file mode 100644
index f9b32b4..0000000
--- a/doc/source/guide/intro/devtools.md
+++ /dev/null
@@ -1,100 +0,0 @@
----
-title: Using Devtools
-type: guide
-order: 5.7
-version: 2.1
----
-
-# Devtools
-
-Weex devtools is a custom devtools for weex that implements [Chrome Debugging Protocol](https://developer.chrome.com/devtools/docs/debugger-protocol), it is designed to help you quickly inspect your app and debug your JS bundle source in a chrome web page, both Android and IOS platform are supported.
-
-## Install
-
-```
- $ npm install -g weex-toolkit
-```
-#### usage
-```
-weex debug [options] [we_file|bundles_dir]
-
- Options:
-
- -h, --help output usage information
- -V, --verbose display logs of debugger server
- -v, --version display version
- -p, --port [port] set debugger server port
- -e, --entry [entry] set the entry bundlejs path when you specific the bundle server root path
- -m, --mode [mode] set build mode [transformer|loader]
- -w, --watch watch we file changes auto build them and refresh debugger page![default enabled]
-```
-
-#### start debugger
-```
-$weex debug
-```
-this command will start debug server and launch a chrome opening `DeviceList` page.
-this page will display a qrcode ,you can use `Playground App` scan it for starting debug.
-
-#### start debugger with a we file
-```
-$weex debug your_weex.we
-```
-this command will compile `your_weex.we` to `your_weex.js` and start the debug server as upon command.
-`your_weex.js` will deploy on the server and displayed in `DeviceList` page as another qrcode contain the url of your_weex.js
-
-
-#### start debugger with a directory of we files
-```
-$weex debug your/we/path -e index.we
-```
-this command will build every file in your/we/path and deploy them on the bundle server. your directory will mapping to http://localhost:port/weex/
-use -e to set the entry of these bundles. and the url of "index.we" will display on device list page as another qrcode.
-
-## Features
-
-### Connect devices
-
-
-### Inspector
- Inspector can be used to show your `Element` \ `Network` \ `Console log` \ `ScreenCast` \ `BoxModel` \ `Native View` and so on.
-
-
-
-#### Element
-##### native view element
-
-
-##### weex dom element
-
-
-#### Network
-
-##### show the total time and latency
-
-
-##### show the header and response
-
-
-#### Console
-
-
-#### Resource
-
-
-### Debugger
-
- Debugger can be used to debug your bundle js source, you can set `Breakpoint` \ watch `CallStack`.
-
-
-
-#### Breakpoint and CallStack
-
-
-
-## Integrate devtools
-
-* Android
- * See the doc [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), it will lead you to config and use it step by step.
-* IOS
- * See the doc [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), it will lead you to config and use it step by step.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 338502b..71ad2fd 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -10,7 +10,7 @@ has_chapter_content: true
Use dotWe is a good choice, But if you want to develop locally on your own machine, you will set up your development environment.
-You will need Node.js and the Weex CLi.
+You will need Node.js and the [Weex CLi](https://github.com/weexteam/weex-toolkit).
You can installing Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f6838783/doc/source/guide/tools/weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/weexpack.md b/doc/source/guide/tools/weexpack.md
index 699431f..dd0ee36 100644
--- a/doc/source/guide/tools/weexpack.md
+++ b/doc/source/guide/tools/weexpack.md
@@ -283,6 +283,8 @@ After all above steps, you could modify your application we/vue files under src
+[Plugin development guide](https://github.com/weexteam/weex-pack/blob/master/doc/plugin-devloping-web.md)
+
## Examples
[Create Weex One App with Weexpack](https://github.com/weexteam/weex-pack/wiki/Create-Weex-One-App-with-Weexpack)
[40/50] incubator-weex git commit: * [doc] Update cnzz id.
Posted by cx...@apache.org.
* [doc] Update cnzz id.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c62bcfec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c62bcfec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c62bcfec
Branch: refs/heads/0.11-dev
Commit: c62bcfecf40061156c83d22de6d58251b0a83714
Parents: 1cbdcb5
Author: Yun Dong <yu...@gmail.com>
Authored: Wed Mar 15 12:03:14 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Wed Mar 15 12:03:14 2017 +0800
----------------------------------------------------------------------
doc/_config.yml | 2 +-
doc/themes/weex/layout/_partial/after-footer.ejs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c62bcfec/doc/_config.yml
----------------------------------------------------------------------
diff --git a/doc/_config.yml b/doc/_config.yml
index adeb1fd..32b8185 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -5,7 +5,7 @@
# Site
title: Weex
subtitle:
-description:
+description: A framework for building Mobile cross-platform UIs. Different from a "web app", "HTML5 app", or "hybrid app", you can use Weex to build a real mobile app. The code that you write is relatively simple, because you can build native applications just using HTML, CSS, Javascript. But underneath, the core of the application is Objective-C or Java. At the same time, Weex will provide a lot of native components or modules for developers to use.
author: Jinjiang
language:
- en
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c62bcfec/doc/themes/weex/layout/_partial/after-footer.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/after-footer.ejs b/doc/themes/weex/layout/_partial/after-footer.ejs
index 186f20b..babfb3c 100644
--- a/doc/themes/weex/layout/_partial/after-footer.ejs
+++ b/doc/themes/weex/layout/_partial/after-footer.ejs
@@ -1,3 +1,3 @@
<div style="display: none;">
- <script src="//s95.cnzz.com/z_stat.php?id=1261102667&web_id=1261102667" language="JavaScript"></script>
+ <script src="//s95.cnzz.com/z_stat.php?id=1261496509&web_id=1261496509" language="JavaScript"></script>
</div>
[17/50] incubator-weex git commit: Merge branch 'feature-tools-doc'
of https://github.com/DoranYun/incubator-weex into dev This closes #54
Posted by cx...@apache.org.
Merge branch 'feature-tools-doc' of https://github.com/DoranYun/incubator-weex into dev
This closes #54
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ca43fa3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ca43fa3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ca43fa3c
Branch: refs/heads/0.11-dev
Commit: ca43fa3c705abde1f0fc8411d0c4af4de20f13ec
Parents: 20d9d5f f683878
Author: Jinjiang <zh...@me.com>
Authored: Wed Mar 8 14:04:50 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Wed Mar 8 14:04:50 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/dev-with-weexpack.md | 11 -
doc/source/cn/guide/index.md | 114 ------
doc/source/cn/guide/intro/app-architecture.md | 2 +-
doc/source/cn/guide/intro/devtools.md | 99 -----
doc/source/cn/guide/intro/how-it-works.md | 2 +-
doc/source/cn/guide/intro/index.md | 2 +-
doc/source/cn/guide/intro/page-architecture.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/web-dev-experience.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 2 +-
doc/source/cn/guide/set-up-env.md | 128 ++++++
doc/source/cn/guide/tools/devtools.md | 111 ++++++
doc/source/cn/guide/tools/index.md | 11 +
doc/source/cn/guide/tools/weexpack.md | 388 +++++++++++++++++++
.../cn/references/advanced/extend-to-ios.md | 231 +++++------
doc/source/cn/references/common-style.md | 11 +-
doc/source/cn/references/components/cell.md | 2 +-
doc/source/cn/references/components/scroller.md | 8 +-
doc/source/cn/references/gesture.md | 3 +-
doc/source/guide/dev-with-weexpack.md | 12 -
doc/source/guide/index.md | 52 ---
doc/source/guide/intro/app-architecture.md | 2 +-
doc/source/guide/intro/devtools.md | 100 -----
doc/source/guide/intro/how-it-works.md | 2 +-
doc/source/guide/intro/index.md | 2 +-
doc/source/guide/intro/page-architecture.md | 2 +-
doc/source/guide/intro/using-vue.md | 2 +-
doc/source/guide/intro/web-dev-experience.md | 2 +-
doc/source/guide/intro/write-once.md | 2 +-
doc/source/guide/set-up-env.md | 93 +++++
doc/source/guide/tools/devtools.md | 100 +++++
doc/source/guide/tools/index.md | 11 +
doc/source/guide/tools/weexpack.md | 300 ++++++++++++++
33 files changed, 1288 insertions(+), 525 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ca43fa3c/doc/source/cn/references/components/cell.md
----------------------------------------------------------------------
[18/50] incubator-weex git commit: * [doc] Update GitHub link,
change from alibaba/weex to apache/weex.
Posted by cx...@apache.org.
* [doc] Update GitHub link, change from alibaba/weex to apache/weex.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0f97d7c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0f97d7c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0f97d7c1
Branch: refs/heads/0.11-dev
Commit: 0f97d7c1765bbcbfacc308047ccd8b69b70d62aa
Parents: ca43fa3
Author: Yun Dong <yu...@gmail.com>
Authored: Thu Mar 9 11:31:13 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Thu Mar 9 11:31:13 2017 +0800
----------------------------------------------------------------------
doc/source/cn/faq.md | 2 +-
doc/source/cn/guide/integrate-to-your-app.md | 4 ++--
doc/source/cn/references/modules/storage.md | 2 +-
doc/source/cn/references/modules/websocket.md | 6 +++---
doc/source/cn/v-0.10/advanced/extend-to-html5.md | 2 +-
doc/source/cn/v-0.10/advanced/integrate-to-android.md | 4 ++--
doc/source/cn/v-0.10/references/modules/storage.md | 2 +-
doc/source/cn/v-0.10/tools/devtools.md | 4 ++--
doc/source/faq.md | 2 +-
doc/source/references/modules/websocket.md | 6 +++---
doc/source/v-0.10/advanced/extend-to-html5.md | 2 +-
doc/source/v-0.10/advanced/integrate-to-android.md | 6 +++---
doc/source/v-0.10/guide/how-to/preview-in-playground-app.md | 2 +-
doc/themes/weex/layout/_partial/header.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 2 +-
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
16 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/faq.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/faq.md b/doc/source/cn/faq.md
index 871a857..ba6145b 100644
--- a/doc/source/cn/faq.md
+++ b/doc/source/cn/faq.md
@@ -17,7 +17,7 @@ layout: post
## Windows \u6307\u4ee4\u9519\u8bef
-\u8bf7\u5148\u5b89\u88c5 [Git for Windows](https://git-scm.com/download/win)\uff0c\u5728 [For Windows](https://github.com/alibaba/weex/tree/dev#for-windows) \u4e2d\u67e5\u770b\u66f4\u591a\u4fe1\u606f\u3002
+\u8bf7\u5148\u5b89\u88c5 [Git for Windows](https://git-scm.com/download/win)\uff0c\u5728 [For Windows](https://github.com/apache/incubator-weex/tree/dev#for-windows) \u4e2d\u67e5\u770b\u66f4\u591a\u4fe1\u606f\u3002
## Android Studio \u4e2d Gradle \u9519\u8bef
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/guide/integrate-to-your-app.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/integrate-to-your-app.md b/doc/source/cn/guide/integrate-to-your-app.md
index 3461aa7..bd1f2d7 100644
--- a/doc/source/cn/guide/integrate-to-your-app.md
+++ b/doc/source/cn/guide/integrate-to-your-app.md
@@ -22,8 +22,8 @@ has_chapter_content: true
- \u5df2\u7ecf\u5b89\u88c5\u4e86[JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) version>=1.7 \u5e76\u914d\u7f6e\u4e86\u73af\u5883\u53d8\u91cf
- \u5df2\u7ecf\u5b89\u88c5[Android SDK](https://developer.android.com/studio/index.html) \u5e76\u914d\u7f6e\u73af\u5883\u53d8\u91cf\u3002
-- Android SDK version 23 (compileSdkVersion in [`build.gradle`](https://github.com/alibaba/weex/blob/master/android/sdk/build.gradle))
-- SDK build tools version 23.0.1 (buildToolsVersion in [`build.gradle`](https://github.com/alibaba/weex/blob/master/android/sdk/build.gradle))
+- Android SDK version 23 (compileSdkVersion in [`build.gradle`](https://github.com/apache/incubator-weex/blob/master/android/sdk/build.gradle))
+- SDK build tools version 23.0.1 (buildToolsVersion in [`build.gradle`](https://github.com/apache/incubator-weex/blob/master/android/sdk/build.gradle))
- Android Support Repository >= 17 (for Android Support Library)
### \u5feb\u901f\u63a5\u5165
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/references/modules/storage.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/storage.md b/doc/source/cn/references/modules/storage.md
index e0c8637..2a88a3a 100644
--- a/doc/source/cn/references/modules/storage.md
+++ b/doc/source/cn/references/modules/storage.md
@@ -181,4 +181,4 @@ version: 2.1
## \u5176\u5b83\u53c2\u8003
* [W3school: html5 localStorage](http://www.w3school.com.cn/html5/html_5_webstorage.asp)
-* [storage \u6a21\u5757\u5b8c\u6574\u7684 Demo](https://github.com/alibaba/weex/blob/dev/examples/module/storage-demo.we)
+* [storage \u6a21\u5757\u5b8c\u6574\u7684 Demo](https://github.com/apache/incubator-weex/blob/dev/examples/module/storage-demo.we)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/references/modules/websocket.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/websocket.md b/doc/source/cn/references/modules/websocket.md
index 8efaaa6..de99ad3 100644
--- a/doc/source/cn/references/modules/websocket.md
+++ b/doc/source/cn/references/modules/websocket.md
@@ -13,9 +13,9 @@ WebSockets \u662f\u4e00\u79cd\u5148\u8fdb\u7684\u6280\u672f, \u8fd9\u4f7f\u5f97\u5728\u7528\u6237\u7684 H5/iOS/Android \u548c\u4e00
## **\u6ce8\u610f\uff1a**
- iOS\u548ch5\u63d0\u4f9b WebSockets \u7684 protocol \u9ed8\u8ba4\u5b9e\u73b0\uff0c\u5b89\u5353\u4f7f\u7528\u9700\u8981\u63d0\u4f9b\u81ea\u5b9a\u4e49 adapter \u5b9e\u73b0\uff0csource:
- - [DefaultWebSocketAdapter.java](https://github.com/alibaba/weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapter.java);
- - [DefaultWebSocketAdapterFactory.java](https://github.com/alibaba/weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapterFactory.java);
- - \u96c6\u6210\u4f8b\u5b50\u53c2\u8003weex [playground](https://github.com/alibaba/weex/tree/dev/android/playground)
+ - [DefaultWebSocketAdapter.java](https://github.com/apache/incubator-weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapter.java);
+ - [DefaultWebSocketAdapterFactory.java](https://github.com/apache/incubator-weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapterFactory.java);
+ - \u96c6\u6210\u4f8b\u5b50\u53c2\u8003weex [playground](https://github.com/apache/incubator-weex/tree/dev/android/playground)
- \u53ea\u5728.we\u6587\u4ef6\u652f\u6301\uff0c\u4e0d\u652f\u6301vue2.0
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/v-0.10/advanced/extend-to-html5.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/v-0.10/advanced/extend-to-html5.md b/doc/source/cn/v-0.10/advanced/extend-to-html5.md
index fec27d8..ff99629 100644
--- a/doc/source/cn/v-0.10/advanced/extend-to-html5.md
+++ b/doc/source/cn/v-0.10/advanced/extend-to-html5.md
@@ -77,7 +77,7 @@ export default { init }
- `appendChild` \u5728\u5b50\u8282\u70b9\u5217\u8868\u7684\u6700\u540e\u52a0\u4e0a\u4e00\u4e2a\u8282\u70b9.
- `removeChild` \u79fb\u9664\u4e00\u4e2a\u5b50\u8282\u70b9.
-**\u8fdb\u9636**\uff1a\u66f4\u591a\u5173\u4e8e\u7ec4\u4ef6\u5b9a\u5236\u548c\u6269\u5c55\u7684\u7ec6\u8282\u548c\u4ee3\u7801\u5c55\u793a\uff0c\u53ef\u4ee5\u53c2\u8003 [weex \u4e3b\u4ed3\u5e93\u7684\u4ee3\u7801](https://github.com/alibaba/weex/tree/dev/html5/browser/extend/components)\uff0c\u8fd9\u91cc\u7684\u7ec4\u4ef6\u57fa\u672c\u4e0a\u90fd\u662f\u901a\u8fc7\u4e0a\u8ff0\u65b9\u5f0f\u8fdb\u884c\u5b9a\u4e49\u7684\u3002
+**\u8fdb\u9636**\uff1a\u66f4\u591a\u5173\u4e8e\u7ec4\u4ef6\u5b9a\u5236\u548c\u6269\u5c55\u7684\u7ec6\u8282\u548c\u4ee3\u7801\u5c55\u793a\uff0c\u53ef\u4ee5\u53c2\u8003 [weex \u4e3b\u4ed3\u5e93\u7684\u4ee3\u7801](https://github.com/apache/incubator-weex/tree/dev/html5)\uff0c\u8fd9\u91cc\u7684\u7ec4\u4ef6\u57fa\u672c\u4e0a\u90fd\u662f\u901a\u8fc7\u4e0a\u8ff0\u65b9\u5f0f\u8fdb\u884c\u5b9a\u4e49\u7684\u3002
\u91cd\u8981\u7684\u4e00\u70b9\uff0c\u6ce8\u518c\u7ec4\u4ef6\u7684\u5173\u952e\u65b9\u6cd5\u662f `Weex.registerComponent`\uff0c\u5982\u793a\u4f8b\u91cc\u7684 `weex-hello` \u7ec4\u4ef6\u7684\u6ce8\u518c\uff1a
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/v-0.10/advanced/integrate-to-android.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/v-0.10/advanced/integrate-to-android.md b/doc/source/cn/v-0.10/advanced/integrate-to-android.md
index 19d7192..b5bbf8c 100644
--- a/doc/source/cn/v-0.10/advanced/integrate-to-android.md
+++ b/doc/source/cn/v-0.10/advanced/integrate-to-android.md
@@ -19,8 +19,8 @@ version: 0.10
- \u5df2\u7ecf\u5b89\u88c5\u4e86[JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) version>=1.7 \u5e76\u914d\u7f6e\u4e86\u73af\u5883\u53d8\u91cf
- \u5df2\u7ecf\u5b89\u88c5[Android SDK](https://developer.android.com/studio/index.html) \u5e76\u914d\u7f6e\u73af\u5883\u53d8\u91cf\u3002
-- Android SDK version 23 (compileSdkVersion in [`build.gradle`](https://github.com/alibaba/weex/blob/master/android/sdk/build.gradle))
-- SDK build tools version 23.0.1 (buildToolsVersion in [`build.gradle`](https://github.com/alibaba/weex/blob/master/android/sdk/build.gradle))
+- Android SDK version 23 (compileSdkVersion in [`build.gradle`](https://github.com/apache/incubator-weex/blob/master/android/sdk/build.gradle))
+- SDK build tools version 23.0.1 (buildToolsVersion in [`build.gradle`](https://github.com/apache/incubator-weex/blob/master/android/sdk/build.gradle))
- Android Support Repository >= 17 (for Android Support Library)
## \u5feb\u901f\u63a5\u5165
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/v-0.10/references/modules/storage.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/v-0.10/references/modules/storage.md b/doc/source/cn/v-0.10/references/modules/storage.md
index e85d64c..c18b9ae 100644
--- a/doc/source/cn/v-0.10/references/modules/storage.md
+++ b/doc/source/cn/v-0.10/references/modules/storage.md
@@ -221,4 +221,4 @@ storage.getAllKeys(function (e) {
## \u5176\u5b83\u53c2\u8003
* [W3school: html5 localStorage](http://www.w3school.com.cn/html5/html_5_webstorage.asp)
-* [storage \u6a21\u5757\u5b8c\u6574\u7684 Demo](https://github.com/alibaba/weex/blob/dev/examples/module/storage-demo.we)
+* [storage \u6a21\u5757\u5b8c\u6574\u7684 Demo](https://github.com/apache/incubator-weex/blob/dev/examples/module/storage-demo.we)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/cn/v-0.10/tools/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/v-0.10/tools/devtools.md b/doc/source/cn/v-0.10/tools/devtools.md
index 24fa943..ab7ddb3 100644
--- a/doc/source/cn/v-0.10/tools/devtools.md
+++ b/doc/source/cn/v-0.10/tools/devtools.md
@@ -94,6 +94,6 @@ your/we/path/`demo/test.we` \u53ef\u4ee5\u901a\u8fc7http://lcoalhost:8088/weex/demo/index.js
#### \u96c6\u6210devtools
- Android
- - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (Android)](https://github.com/alibaba/weex/blob/dev/android/inspector/README.md), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
+ - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (Android)](../advanced/integrate-devtools-to-android.html), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
- IOS
- - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (IOS)](https://github.com/alibaba/weex/blob/dev/ios/WXDevtool/README.md), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
+ - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (IOS)](../advanced/integrate-devtools-to-ios.html), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/faq.md
----------------------------------------------------------------------
diff --git a/doc/source/faq.md b/doc/source/faq.md
index 4c21d20..d9b5928 100644
--- a/doc/source/faq.md
+++ b/doc/source/faq.md
@@ -15,7 +15,7 @@ layout: post
## Command errors in Windows
-Please install [Git for Windows](https://git-scm.com/download/win) first, see [For Windows](https://github.com/alibaba/weex/tree/dev#for-windows) for more information.
+Please install [Git for Windows](https://git-scm.com/download/win) first, see [For Windows](https://github.com/apache/incubator-weex/tree/dev#for-windows) for more information.
## Gradle errors in Android Studio
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/references/modules/websocket.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/websocket.md b/doc/source/references/modules/websocket.md
index b2752f4..e40cdf1 100644
--- a/doc/source/references/modules/websocket.md
+++ b/doc/source/references/modules/websocket.md
@@ -13,9 +13,9 @@ WebSockets is an advanced technology that makes it possible to open an interacti
## **Notes:**
- iOS and h5 provide webSocket default handle. if you use webSocket in android environment . you should provide custom adapter implementation,source:
- - [DefaultWebSocketAdapter.java](https://github.com/alibaba/weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapter.java);
- - [DefaultWebSocketAdapterFactory.java](https://github.com/alibaba/weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapterFactory.java);
- - refer: [weex playground](https://github.com/alibaba/weex/tree/dev/android/playground)
+ - [DefaultWebSocketAdapter.java](https://github.com/apache/incubator-weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapter.java);
+ - [DefaultWebSocketAdapterFactory.java](https://github.com/apache/incubator-weex/blob/dev/android/commons/src/main/java/com/alibaba/weex/commons/adapter/DefaultWebSocketAdapterFactory.java);
+ - refer: [weex playground](https://github.com/apache/incubator-weex/tree/dev/android/playground)
- only support in .we file,not support in vue2.0
## API
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/v-0.10/advanced/extend-to-html5.md
----------------------------------------------------------------------
diff --git a/doc/source/v-0.10/advanced/extend-to-html5.md b/doc/source/v-0.10/advanced/extend-to-html5.md
index 4386dd6..6201fc7 100644
--- a/doc/source/v-0.10/advanced/extend-to-html5.md
+++ b/doc/source/v-0.10/advanced/extend-to-html5.md
@@ -78,7 +78,7 @@ This demo has overrided the `create` method of the base class `Component`. You c
* `appendChild` to append a child in the children list.
* `removeChild` to remove a child in the children list.
-**Advanced**: Need more code demonstrations about overriding the component's methods ? Just take a look at the [weex repo's code](https://github.com/alibaba/weex/tree/dev/html5/browser/extend/components). Basically the most of the built-in components are defined this way.
+**Advanced**: Need more code demonstrations about overriding the component's methods ? Just take a look at the [weex repo's code](https://github.com/apache/incubator-weex/tree/dev/html5/). Basically the most of the built-in components are defined this way.
Important! To register your component in the `init` method, use `Weex.registerComponent`. Here's the demo code:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/v-0.10/advanced/integrate-to-android.md
----------------------------------------------------------------------
diff --git a/doc/source/v-0.10/advanced/integrate-to-android.md b/doc/source/v-0.10/advanced/integrate-to-android.md
index 9671bcd..e2b2569 100644
--- a/doc/source/v-0.10/advanced/integrate-to-android.md
+++ b/doc/source/v-0.10/advanced/integrate-to-android.md
@@ -16,8 +16,8 @@ Assuming you have the Android SDK installed, run `android` to open the Android S
Make sure you have the following installed:
-1. Android SDK version 23 (compileSdkVersion in [`build.gradle`](https://github.com/alibaba/weex/blob/master/android/sdk/build.gradle))
-2. SDK build tools version 23.0.2 (buildToolsVersion in [`build.gradle`](https://github.com/alibaba/weex/blob/master/android/sdk/build.gradle))
+1. Android SDK version 23 (compileSdkVersion in [`build.gradle`](https://github.com/apache/incubator-weex/blob/master/android/sdk/build.gradle))
+2. SDK build tools version 23.0.2 (buildToolsVersion in [`build.gradle`](https://github.com/apache/incubator-weex/blob/master/android/sdk/build.gradle))
3. Android Support Repository >= 17 (for Android Support Library)
4. Android NDK (download & extraction instructions [here](http://developer.android.com/ndk/downloads/index.html))
@@ -201,4 +201,4 @@ That's it, your activity is ready to run some JavaScript code.
## Reference Example
-[`Weex Examples`](https://github.com/alibaba/weex/tree/master/examples)
+[`Weex Examples`](https://github.com/apache/incubator-weex/tree/master/examples)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/source/v-0.10/guide/how-to/preview-in-playground-app.md
----------------------------------------------------------------------
diff --git a/doc/source/v-0.10/guide/how-to/preview-in-playground-app.md b/doc/source/v-0.10/guide/how-to/preview-in-playground-app.md
index b2cbb90..5800737 100644
--- a/doc/source/v-0.10/guide/how-to/preview-in-playground-app.md
+++ b/doc/source/v-0.10/guide/how-to/preview-in-playground-app.md
@@ -8,7 +8,7 @@ version: 0.10
# How to preview weex code in sample-app ?
### Weex Sample Step By Step
-1. Clone Weex from github [`https://github.com/alibaba/weex/`](https://github.com/alibaba/weex/)
+1. Clone Weex from github [`https://github.com/apache/incubator-weex/`](https://github.com/apache/incubator-weex/)
2. Use Android Studio open Android Sample \u3002
3. run Sample project.
4. into Sample homePage\uff0cyou will see this picture
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/themes/weex/layout/_partial/header.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/header.ejs b/doc/themes/weex/layout/_partial/header.ejs
index 9b2cdb6..5325226 100644
--- a/doc/themes/weex/layout/_partial/header.ejs
+++ b/doc/themes/weex/layout/_partial/header.ejs
@@ -30,7 +30,7 @@
</li>
</ul>
<ul class="info">
- <li><a href="https://github.com/alibaba/weex/" target="_blank"><span class="btn-github iconfont icon-github"></span></a></li>
+ <li><a href="https://github.com/apache/incubator-weex/" target="_blank"><span class="btn-github iconfont icon-github"></span></a></li>
</ul>
<ul class="tools">
<li>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/themes/weex/layout/_partial/sidebar.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/sidebar.ejs b/doc/themes/weex/layout/_partial/sidebar.ejs
index 2287671..5816ea4 100644
--- a/doc/themes/weex/layout/_partial/sidebar.ejs
+++ b/doc/themes/weex/layout/_partial/sidebar.ejs
@@ -45,7 +45,7 @@
</ul>
</li>
<li>
- <a href="https://github.com/alibaba/weex" target="_blank">
+ <a href="https://github.com/apache/incubator-weex/" target="_blank">
<%= _p('menu.github') %>
</a>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0f97d7c1/doc/themes/weex/layout/_partial/slider.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/slider.ejs b/doc/themes/weex/layout/_partial/slider.ejs
index 295df0d..f35c58f 100644
--- a/doc/themes/weex/layout/_partial/slider.ejs
+++ b/doc/themes/weex/layout/_partial/slider.ejs
@@ -6,7 +6,7 @@
<h1 class="page-title"><%= _p('index.page_title') %></h1>
<div class="btn-group">
<a href="<%= url_for_lang('guide/index.html') %>" class="button get-started"><%= _p('index.get_started') %></a>
- <a href="https://github.com/alibaba/weex/" class="button get-started" target="_blank"><%= _p('menu.github') %></a>
+ <a href="https://github.com/apache/incubator-weex/" class="button get-started" target="_blank"><%= _p('menu.github') %></a>
</div>
</div>
</div>
[19/50] incubator-weex git commit: Fix some grammatical issues on the
English webpage
Posted by cx...@apache.org.
Fix some grammatical issues on the English webpage
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/199b35f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/199b35f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/199b35f7
Branch: refs/heads/0.11-dev
Commit: 199b35f72844c03fca763e60843aa4de2ddd0d3b
Parents: 6e71437
Author: Theron Patrick <th...@gmail.com>
Authored: Thu Mar 9 10:01:12 2017 -0500
Committer: Theron Patrick <th...@gmail.com>
Committed: Thu Mar 9 10:01:12 2017 -0500
----------------------------------------------------------------------
doc/themes/weex/languages/en.yml | 38 +++++++++++++++++------------------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/199b35f7/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index d5a0015..968527a 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -1,31 +1,31 @@
index:
- page_title: A framework for building Mobile cross-platform UI
+ page_title: A framework for building Mobile cross-platform UIs
get_started: Get Started
edge:
title: Competitive Edge
- edge1:
+ edge1:
title: Lightweight
content: low footprint\uff0csimple syntax\uff0cand easy to use
- edge2:
+ edge2:
title: Extendable
- content: abundant build-in components\uff0cextendable apis\uff0cvarious events
- edge3:
+ content: abundant built-in components\uff0cextendable apis\uff0cvarious events
+ edge3:
title: High Performance
content: load fast\uff0crender fast\uff0cbetter Experience
- feature:
- title: Help you build real Native App
- content: Different from "web app" , "HTML5 app" and "hybrid app", you can use Weex to build a real mobile app. More intimate is that you write the code is relatively simple, just use HTML, CSS, Javascript can build native applications.But in fact, the bottom of the application is Objective-C or Java. At the same time, Weex will provide a lot of native components or modules for developers to use.
+ feature:
+ title: Help you build a real Native App
+ content: Different from a "web app", "HTML5 app", or "hybrid app", you can use Weex to build a real mobile app. The code that you write is relatively simple, because you can build native applications just using HTML, CSS, Javascript. But underneath, the core of the application is Objective-C or Java. At the same time, Weex will provide a lot of native components or modules for developers to use.
cross_platform:
title: Write Once Run Everywhere
- content: Weex provides the ability to cross platform, such as the web, Android and IOS can use the same API development function. At the same time, we provide a rich extension of the interface. In this way, it will be very convenient when you need to extend native components or modules.
+ content: Weex provides the ability to publish cross platform, so web, Android, and IOS apps can use the same API development functions. At the same time, we provide a rich extension of the native interfaces. In this way, it will be very convenient when you need to extend native components or modules.
vue:
title: Supporting Vue syntax
content: Weex follows the web standard, while supporting the "vue.js" syntax. So, you can use the "vue.js" syntax to develop applications.
schematic:
title: How it works
- content: Weex is a extendable cross-platform solution for dynamic programming and publishing projects. In the source code you can write pages or components with <template>, <style> and <script> tags, and then transform them into bundles for deploying. In server-side we can use these JS bundles for client request. When client get a bundle from server, it will be processed by client-side JavaScript engine and manages the native view rendering, the native API invoking and user interactions.
- users:
- title: Who use it
+ content: Weex is a extendable cross-platform solution for dynamic programming and publishing projects. In the source code you can write pages or components with <template>, <style> and <script> tags, and then transform them into bundles for deploying. On the server-side we can use these JS bundles for client requests. When clients get a bundle from the server, it will be processed by the client-side JavaScript engine that manages the native view rendering, the native API invoking, and user interactions.
+ users:
+ title: Who uses it
tmall:
title: Tmall
content: Tmall is a business-to-consumer (B2C) platform and is the most visited B2C online retail website in China.
@@ -37,36 +37,36 @@ index:
content: Taobao is China's largest consumer-to-consumer online shopping platform.
dingtalk:
title: DingTalk
- content: DingTalk, an App by Alibaba. Free communication and collaboration platform used by millions of enterprises or orgnization.
+ content: DingTalk, an App by Alibaba. Free communication and collaboration platform used by millions of enterprises or organizations.
alibaba:
title: '1688'
content: Launched in 1999, 1688.com is the leading platform for global wholesale trade. We serve millions of buyers and suppliers around the world.
cainiao:
title: Cainiao
- content: Cainiao is committed to provide you the best tracking service for all kinds of your cross-border packages.
+ content: Cainiao is committed to providing you the best tracking service for all kinds of your cross-border packages.
xiami:
title: Xiami
- content: Xiami is a music and audio platform. That is operated by Alibaba Group.
+ content: Xiami is a music and audio platform that is operated by Alibaba Group.
youku:
title: Youku
content: Youku is one of China's top online video and streaming service platforms.
feedback:
- title: People says
+ title: People say
user1:
name: Tianyu Chen
title: Zhong An Insurance, R&D Director
content: "Weex is not only flexible and powerful, but also allows front-end developers to maximize the reuse of existing technology to help us design a new cross-platform architecture, and as soon as possible into the implementation phase."
- user2:
+ user2:
name: Jianfeng Lin
title: Eleme, FE Leader
content: "Weex provides Web development efficiency and Native performance, comparable to our iterative speed requirements of the team is relatively high, is currently the best solution."
- user3:
+ user3:
name: Taicheng Huang
title: Tmall, Technical Expert
content: "Weex as a lightweight rendering engine also provides a very convenient plug-in mechanism, so that each side can put their ability to play out, give full play to the cat's business, and good support for Global Shopping Festival."
-menu:
+menu:
guide: Guide
references: References
doc: Docs
[29/50] incubator-weex git commit: Update set-up-env.md
Posted by cx...@apache.org.
Update set-up-env.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b9cadf5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b9cadf5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b9cadf5a
Branch: refs/heads/0.11-dev
Commit: b9cadf5a69808fdf0ab87a072bffad47318118ab
Parents: 7a5c202
Author: \u52fe\u4e09\u80a1\u56db <zh...@me.com>
Authored: Fri Mar 10 17:10:45 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Mar 10 17:10:45 2017 +0800
----------------------------------------------------------------------
doc/source/guide/set-up-env.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b9cadf5a/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
index 71ad2fd..759dc9a 100644
--- a/doc/source/guide/set-up-env.md
+++ b/doc/source/guide/set-up-env.md
@@ -1,7 +1,7 @@
---
title: Set Up Development Environment
type: guide
-order: 2
+order: 1.1
version: 2.1
has_chapter_content: true
---
[26/50] incubator-weex git commit: * [website] Added contributing
page.
Posted by cx...@apache.org.
* [website] Added contributing page.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/090244c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/090244c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/090244c4
Branch: refs/heads/0.11-dev
Commit: 090244c4945b69fd2a5239136ba86d0db7a408f3
Parents: ca43fa3
Author: Jinjiang <zh...@me.com>
Authored: Fri Mar 10 16:31:12 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Fri Mar 10 16:32:43 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 38 ++++++-----
doc/source/cn/guide/contributing.md | 108 +++++++++++++++++++++++++++++++
doc/source/guide/contributing.md | 106 ++++++++++++++++++++++++++++++
3 files changed, 236 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/090244c4/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9ba3a36..a688622 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,18 @@
-# Weex Contributing Guide
+# How to Contribute
-Welcome to create [Pull Requests](https://github.com/alibaba/weex/compare) or open [Issues](https://github.com/alibaba/weex/issues/new) for bugfix, doc, example, suggestion and anything.
+Welcome to create [pull requests](https://github.com/apache/incubator-weex/compare) or join in our [mailing list](http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/) for bugfix, doc, example, suggestion and anything.
+
+## Join in Weex Mailing List
+
+In Weex community all discussion will happen on mailing list.
+
+Just send an email to `dev-subscribe@weex.incubator.apache.org` and follow the instructions to subscribe Weex dev mailing list. And then you will receive all discussions and community messages by your personal email. In the same time you can freely send your own emails to join in us.
+
+At the same time you can see the archives of all the mails through the web: [http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/](http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/)
+
+*If you won't follow the mailing list any more. There is another way to unsubscribe it: send an email to `dev-unsubscribe@weex.incubator.apache.org` and follow the instructions.*
+
+Besides Weex dev mailing list, we also have some other mailing lists for you. You can check them out here: [http://mail-archives.apache.org/mod_mbox/#weex.incubator](http://mail-archives.apache.org/mod_mbox/#weex.incubator)
## Branch Management
@@ -10,13 +22,12 @@ master
dev <--- PR(hotfix/typo/3rd-PR)
\u2191 PR
{domain}-feature-{date}
-```
-Weex Branches
+```
0. `master` branch
0. `master` is the latest (pre-)release branch.
0. `dev` branch
- 0. `dev` is the stable developing branch. [Github Release](https://help.github.com/articles/creating-releases/) is used to publish a (pre-)release version to `master` branch.
+ 0. `dev` is the stable developing branch.
0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `dev`***.
0. `{domain}-feature-{date}` branch
0. The branch for a developing iteration, e.g. `android-feature-20160607` is an android developing iteration which is done at 2016.06.07. `{domain}` consists of `android`, `ios`, `jsfm` and `html5`.
@@ -53,7 +64,7 @@ for example:
* `{module}`
* Including: android, ios, jsfm, html5, component, doc, website, example, test, all
* `{description}`
- * It's ***RECOMMENDED*** to close issue with syntax `close #123` or `fix #123`, see [the doc](https://help.github.com/articles/closing-issues-via-commit-messages/) for more detail. It's useful for responding issues and [release flow](https://github.com/alibaba/weex/releases/tag/v0.5.0).
+ * Just make it as clear and simple as possible.
for example:
@@ -61,19 +72,14 @@ for example:
* `* [doc] fix #123, update video auto-play property`
* `- [example] remove abc`
-
## Pull Request
-[Create Pull Requests](https://github.com/alibaba/weex/compare).
-
-## Contributor License Agreement
-In order to contribute code to Weex, you (or the legal entity you represent) must sign the Contributor License Agreement (CLA).
-
-You can read and sign the [Alibaba CLA](https://cla-assistant.io/alibaba/weex) online.
-
-For CLA assistant service works properly, please make sure you have added email address that your commits linked to GitHub account.
+You can [create pull requests](https://github.com/apache/incubator-weex/compare) in GitHub.
-Please read [How to setting your Email address in Git](https://help.github.com/articles/setting-your-email-in-git/) and [How to adding an email address to your GitHub Account](https://help.github.com/articles/adding-an-email-address-to-your-github-account/).
+1. First we suggest you have some discussion with the community (commonly in our mailing list) before you code.
+2. Fork repo from [https://github.com/apache/incubator-weex/](https://github.com/apache/incubator-weex/)
+3. Finish the job you want to do.
+4. Create a pull request.
## Code Style Guide
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/090244c4/doc/source/cn/guide/contributing.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/contributing.md b/doc/source/cn/guide/contributing.md
new file mode 100644
index 0000000..4ef9882
--- /dev/null
+++ b/doc/source/cn/guide/contributing.md
@@ -0,0 +1,108 @@
+---
+title: \u5982\u4f55\u53c2\u4e0e\u793e\u533a
+type: guide
+order: 6
+has_chapter_content: true
+version: 2.1
+---
+
+# \u5982\u4f55\u53c2\u4e0e\u793e\u533a
+
+## \u52a0\u5165 Weex \u90ae\u4ef6\u5217\u8868 (Mailing List)
+
+\u5728 Weex \u5b98\u65b9\u793e\u533a\u6240\u6709\u7684\u4fe1\u606f\u90fd\u4f1a\u6c47\u805a\u4e8e\u90ae\u4ef6\u5217\u8868\u3002\u8ba2\u9605\u5f00\u53d1\u90ae\u4ef6\u5217\u8868\u7684\u65b9\u5f0f\u662f\u53d1\u9001\u90ae\u4ef6\u5230 `dev-subscribe@weex.incubator.apache.org` \u7136\u540e\u4f60\u7684\u90ae\u7bb1\u4f1a\u6536\u5230\u4e00\u5c01\u6765\u81ea Apache \u7684\u56de\u4fe1 (\u82f1\u6587)\uff0c\u628a Apache \u7684\u8fd9\u5c01\u56de\u4fe1\u518d\u6b21\u56de\u590d\u8fc7\u53bb\uff0c\u5373\u53ef\u5b8c\u6210\u8ba2\u9605\u3002
+
+\u8fd9\u91cc\u9700\u8981\u5f3a\u8c03\u7684\u662f Apache \u662f\u4e00\u4e2a\u9762\u5411\u5168\u7403\u7684\u5168\u82f1\u6587\u7684\u793e\u533a\uff0c\u6240\u4ee5\u6211\u4eec\u5e0c\u671b\u60a8\u80fd\u591f\u7528\u82f1\u6587\u5728\u90ae\u4ef6\u5217\u8868\u4e2d\u8ddf\u5927\u5bb6\u4ea4\u6d41\u3002\u6211\u4eec\u6b22\u8fce\u4efb\u4f55\u8ba8\u8bba\uff0cApache \u793e\u533a\u7684\u6bcf\u4e00\u4f4d\u53c2\u4e0e\u8005\u90fd\u975e\u5e38\u53cb\u5584\u5e76\u4e14\u5177\u6709\u6781\u5927\u7684\u5305\u5bb9\u5fc3\uff0c\u60a8\u4e0d\u5fc5\u591a\u8651\u81ea\u5df1\u53ef\u80fd\u4f1a\u9047\u5230\u7684\u4efb\u4f55\u8bed\u8a00\u969c\u788d\u3002\u518d\u6b21\u5f3a\u8c03\uff0c\u6211\u4eec\u9f13\u52b1\u5927\u5bb6\u53c2\u4e0e\u90ae\u4ef6\u5217\u8868\u8ba8\u8bba\uff0c\u5e0c\u671b\u66f4\u591a\u7684\u4e2d\u6587\u7528\u6237\u80fd\u591f\u514b\u670d\u8bed\u8a00\u969c\u788d\uff0c\u6811\u7acb\u4f7f\u7528\u5916\u8bed\u7684\u81ea\u4fe1\u5fc3\uff01
+
+\u6211\u4eec\u540c\u65f6\u5efa\u8bae\u5927\u5bb6\u901a\u8fc7\u5e02\u9762\u4e0a\u4e3b\u6d41\u7684\u7ffb\u8bd1\u8f6f\u4ef6\u548c\u5de5\u5177\u6765\u5e2e\u52a9\u81ea\u5df1\u64b0\u5199\u548c\u9605\u8bfb\u82f1\u6587\u3002
+
+\u5982\u679c\u60a8\u786e\u5b9e\u5bf9\u4f7f\u7528\u82f1\u6587\u5b58\u5728\u5f88\u5927\u7684\u7591\u8651\u6216\u56f0\u60d1\uff0c\u6211\u4eec\u4e5f\u975e\u5e38\u6b22\u8fce\u5927\u5bb6\u6765\u4e2d\u6587\u95ee\u7b54\u5e73\u53f0 [SegmentFault](https://segmentfault.com/t/weex) \u63d0\u95ee\uff0c\u8fd9\u91cc\u6709\u975e\u5e38\u591a\u70ed\u5fc3\u7684\u5f00\u53d1\u8005\u4e00\u8d77\u8ba8\u8bba\u548c\u89e3\u7b54 Weex \u76f8\u5173\u7684\u95ee\u9898\u3002
+
+\u4f7f\u7528\u90ae\u4ef6\u5217\u8868\u7684\u53e6\u5916\u4e00\u4e2a\u597d\u5904\u662f\u5b83\u53ef\u4ee5\u65b9\u4fbf\u5927\u5bb6\u968f\u65f6\u67e5\u9605\u4e4b\u524d\u7684\u90ae\u4ef6\u8bb0\u5f55: [http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/](http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/)
+
+*\u5982\u679c\u60a8\u5bf9\u90ae\u4ef6\u5217\u8868\u4e2d\u7684\u5185\u5bb9\u5df2\u7ecf\u4e0d\u518d\u611f\u5174\u8da3\uff0c\u8fd9\u91cc\u4e5f\u6709\u9000\u8ba2\u90ae\u4ef6\u5217\u8868\u7684\u65b9\u6cd5: \u53d1\u9001\u90ae\u4ef6\u81f3 `dev-unsubscribe@weex.incubator.apache.org` \u5e76\u6839\u636e\u56de\u4fe1\u7684\u63d0\u793a\u8fdb\u884c\u4e8c\u6b21\u56de\u590d\u786e\u8ba4\uff0c\u5b8c\u6210\u9000\u8ba2\u3002*
+
+\u9664\u4e86\u5f00\u53d1 (dev) \u90ae\u4ef6\u5217\u8868\uff0c\u6211\u4eec\u8fd8\u6709\u53e6\u5916\u51e0\u4e2a\u7684\u90ae\u4ef6\u5217\u8868\u4f9b\u5927\u5bb6\u67e5\u9605\uff1a[http://mail-archives.apache.org/mod_mbox/#weex.incubator](http://mail-archives.apache.org/mod_mbox/#weex.incubator)
+
+## \u5206\u652f\u7ba1\u7406 (\u82f1)
+
+```
+master
+ \u2191
+dev <--- PR(hotfix/typo/3rd-PR)
+ \u2191 PR
+{domain}-feature-{date}
+```
+
+0. `master` branch
+ 0. `master` is the latest (pre-)release branch.
+0. `dev` branch
+ 0. `dev` is the stable developing branch.
+ 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `dev`***.
+0. `{domain}-feature-{date}` branch
+ 0. The branch for a developing iteration, e.g. `android-feature-20160607` is an android developing iteration which is done at 2016.06.07. `{domain}` consists of `android`, `ios`, `jsfm` and `html5`.
+ 0. **DO NOT commit any PR to such a branch**.
+
+### \u5206\u652f\u547d\u540d
+
+```
+{module}-{action}-{shortName}
+```
+
+* `{module}`, see [commit log module](#commit-log)
+* `{action}`
+ * `feature`: checkout from `{module}` and merge to `{module}` later. If `{module}` not exists, merge to `dev`
+ * `bugfix`: like `feature`, for bugfix only
+ * `hotfix`: checkout from `master` or release `tag`, merge to `master` and `{module}` later. If `{module}` not exists, merge to `dev`
+
+for example:
+
+* `android-bugfix-memory`
+* `jsfm-feature-communication`
+* `android-hotfix-compute-layout`
+
+## \u63d0\u4ea4\u65e5\u5fd7\u683c\u5f0f (\u82f1)
+
+```
+{action} [{module}] {description}
+```
+
+* `{action}`
+ * `+` add
+ * `*` update or bugfix
+ * `-` remove
+* `{module}`
+ * Including: android, ios, jsfm, html5, component, doc, website, example, test, all
+* `{description}`
+ * Just make it as clear and simple as possible.
+
+for example:
+
+* `+ [android] close #123, add refreshing for WebView`
+* `* [doc] fix #123, update video auto-play property`
+* `- [example] remove abc`
+
+## \u53d1\u9001 Pull Request (\u82f1)
+
+You can [create pull requests](https://github.com/apache/incubator-weex/compare) in GitHub.
+
+1. First we suggest you have some discussion with the community (commonly in our mailing list) before you code.
+2. Fork repo from [https://github.com/apache/incubator-weex/](https://github.com/apache/incubator-weex/)
+3. Finish the job you want to do.
+4. Create a pull request.
+
+## \u7f16\u7801\u89c4\u8303 (\u82f1)
+
+### Objective-C
+
+* Tabs for indentation(not spaces)
+* `*` operator goes with the variable name (e.g. Type *variable;)
+* Function definitions: place each brace on its own line.
+* Other braces: place the open brace on the line preceding the code block; place the close brace on its own line.
+* Use `#pragma marks` to categorize methods into functional groupings and protocol implementations
+* Follow other guidelines on [GitHub Objective-C Style Guide](https://github.com/github/objective-c-style-guide)
+
+### Java & Android
+
+* Use [Google Java Style](https://google.github.io/styleguide/javaguide.html) as basic guidelines of java code.
+* Follow [AOSP Code Style](https://source.android.com/source/code-style.html) for rest of android related code style.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/090244c4/doc/source/guide/contributing.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/contributing.md b/doc/source/guide/contributing.md
new file mode 100644
index 0000000..ea824f4
--- /dev/null
+++ b/doc/source/guide/contributing.md
@@ -0,0 +1,106 @@
+---
+title: How to Contribute
+type: guide
+order: 6
+has_chapter_content: true
+version: 2.1
+---
+
+# How to Contribute
+
+Welcome to create [pull requests](https://github.com/apache/incubator-weex/compare) or join in our [mailing list](http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/) for bugfix, doc, example, suggestion and anything.
+
+## Join in Weex Mailing List
+
+In Weex community all discussion will happen on mailing list.
+
+Just send an email to `dev-subscribe@weex.incubator.apache.org` and follow the instructions to subscribe Weex dev mailing list. And then you will receive all discussions and community messages by your personal email. In the same time you can freely send your own emails to join in us.
+
+At the same time you can see the archives of all the mails through the web: [http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/](http://mail-archives.apache.org/mod_mbox/incubator-weex-dev/)
+
+*If you won't follow the mailing list any more. There is another way to unsubscribe it: send an email to `dev-unsubscribe@weex.incubator.apache.org` and follow the instructions.*
+
+Besides Weex dev mailing list, we also have some other mailing lists for you. You can check them out here: http://mail-archives.apache.org/mod_mbox/#weex.incubator
+
+## Branch Management
+
+```
+master
+ \u2191
+dev <--- PR(hotfix/typo/3rd-PR)
+ \u2191 PR
+{domain}-feature-{date}
+```
+
+0. `master` branch
+ 0. `master` is the latest (pre-)release branch.
+0. `dev` branch
+ 0. `dev` is the stable developing branch.
+ 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `dev`***.
+0. `{domain}-feature-{date}` branch
+ 0. The branch for a developing iteration, e.g. `android-feature-20160607` is an android developing iteration which is done at 2016.06.07. `{domain}` consists of `android`, `ios`, `jsfm` and `html5`.
+ 0. **DO NOT commit any PR to such a branch**.
+
+### Branch Name
+
+```
+{module}-{action}-{shortName}
+```
+
+* `{module}`, see [commit log module](#commit-log)
+* `{action}`
+ * `feature`: checkout from `{module}` and merge to `{module}` later. If `{module}` not exists, merge to `dev`
+ * `bugfix`: like `feature`, for bugfix only
+ * `hotfix`: checkout from `master` or release `tag`, merge to `master` and `{module}` later. If `{module}` not exists, merge to `dev`
+
+for example:
+
+* `android-bugfix-memory`
+* `jsfm-feature-communication`
+* `android-hotfix-compute-layout`
+
+## Commit Log
+
+```
+{action} [{module}] {description}
+```
+
+* `{action}`
+ * `+` add
+ * `*` update or bugfix
+ * `-` remove
+* `{module}`
+ * Including: android, ios, jsfm, html5, component, doc, website, example, test, all
+* `{description}`
+ * Just make it as clear and simple as possible.
+
+for example:
+
+* `+ [android] close #123, add refreshing for WebView`
+* `* [doc] fix #123, update video auto-play property`
+* `- [example] remove abc`
+
+## Pull Request
+
+You can [create pull requests](https://github.com/apache/incubator-weex/compare) in GitHub.
+
+1. First we suggest you have some discussion with the community (commonly in our mailing list) before you code.
+2. Fork repo from [https://github.com/apache/incubator-weex/](https://github.com/apache/incubator-weex/)
+3. Finish the job you want to do.
+4. Create a pull request.
+
+## Code Style Guide
+
+### Objective-C
+
+* Tabs for indentation(not spaces)
+* `*` operator goes with the variable name (e.g. Type *variable;)
+* Function definitions: place each brace on its own line.
+* Other braces: place the open brace on the line preceding the code block; place the close brace on its own line.
+* Use `#pragma marks` to categorize methods into functional groupings and protocol implementations
+* Follow other guidelines on [GitHub Objective-C Style Guide](https://github.com/github/objective-c-style-guide)
+
+### Java & Android
+
+* Use [Google Java Style](https://google.github.io/styleguide/javaguide.html) as basic guidelines of java code.
+* Follow [AOSP Code Style](https://source.android.com/source/code-style.html) for rest of android related code style.
[14/50] incubator-weex git commit: fix the weex-loader url broken in
vue/difference-with-web
Posted by cx...@apache.org.
fix the weex-loader url broken in vue/difference-with-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/422e6e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/422e6e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/422e6e98
Branch: refs/heads/0.11-dev
Commit: 422e6e984cba8d1ae5a54351c48e12be45837b1c
Parents: 0cd033c
Author: luxp <lu...@gmail.com>
Authored: Mon Mar 6 17:58:05 2017 +0800
Committer: luxp <lu...@gmail.com>
Committed: Mon Mar 6 17:58:05 2017 +0800
----------------------------------------------------------------------
doc/source/references/vue/difference-with-web.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/422e6e98/doc/source/references/vue/difference-with-web.md
----------------------------------------------------------------------
diff --git a/doc/source/references/vue/difference-with-web.md b/doc/source/references/vue/difference-with-web.md
index ff328f4..2af11f9 100644
--- a/doc/source/references/vue/difference-with-web.md
+++ b/doc/source/references/vue/difference-with-web.md
@@ -114,7 +114,7 @@ In addition, you should also pay attention to the following points:
Because of the platform difference, you have to compile your source file in two different ways:
+ For the web, you can compile source files in any official way, such as Webpack + vue-loader or Browserify + vueify. and require the [weex-vue-render](https://www.npmjs.com/package/weex-vue-render), which is a group of Weex build-in components.
-+ For Android and iOS, we've provided [weex-loader](https://github.com/weepteam/weep-loader) to compile the `.vue` files. That is, use Webpack + weex-loader to generate the js bundle that is available for the native.
++ For Android and iOS, we've provided [weex-loader](https://github.com/weexteam/weex-loader) to compile the `.vue` files. That is, use Webpack + weex-loader to generate the js bundle that is available for the native.
### Use weex-loader
[48/50] incubator-weex git commit: * [ios] handle error when register
graphic font
Posted by cx...@apache.org.
* [ios] handle error when register graphic font
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/82576803
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/82576803
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/82576803
Branch: refs/heads/0.11-dev
Commit: 8257680344f210913c59a003e7669804df820090
Parents: ece390f
Author: acton393 <zh...@gmail.com>
Authored: Sat Mar 18 00:58:23 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Sat Mar 18 00:58:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/82576803/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
index 2289646..6668e9d 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -348,8 +348,8 @@ static BOOL WXNotStat;
if (error) {
CFRelease(error);
error = nil;
- CTFontManagerUnregisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error);
- CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error);
+ CTFontManagerUnregisterFontsForURL(fontURL, kCTFontManagerScopeProcess, NULL);
+ CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, NULL);
}
NSArray *descriptors = (__bridge_transfer NSArray *)CTFontManagerCreateFontDescriptorsFromURL(fontURL);
// length of descriptors here will be only one.
@@ -357,9 +357,6 @@ static BOOL WXNotStat;
font = [UIFont fontWithDescriptor:desc size:fontSize];
}
CFRelease(fontURL);
- if (error) {
- CFRelease(error);
- }
}
}else {
[36/50] incubator-weex git commit: Merge branch
'website-bugfix-english-grammar' of
https://github.com/theronpatrick/incubator-weex into dev This closes #80
Posted by cx...@apache.org.
Merge branch 'website-bugfix-english-grammar' of https://github.com/theronpatrick/incubator-weex into dev
This closes #80
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e3cd711b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e3cd711b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e3cd711b
Branch: refs/heads/0.11-dev
Commit: e3cd711b346fd32f008d0dc66ca603b4aceb01c1
Parents: 5d44c41 199b35f
Author: Jinjiang <zh...@me.com>
Authored: Mon Mar 13 11:42:29 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Mon Mar 13 11:42:29 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/en.yml | 38 +++++++++++++++++------------------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e3cd711b/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
[33/50] incubator-weex git commit: Merge branch
'website-feature-menu' of http://github.com/Jinjiang/incubator-weex into dev
This closes #90
Posted by cx...@apache.org.
Merge branch 'website-feature-menu' of http://github.com/Jinjiang/incubator-weex into dev
This closes #90
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6ae6840c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6ae6840c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6ae6840c
Branch: refs/heads/0.11-dev
Commit: 6ae6840c753abc7cf4ef80cc07cf36dd3cee795e
Parents: e2e90cd 934fd09
Author: sospartan <so...@gmail.com>
Authored: Fri Mar 10 18:09:32 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Fri Mar 10 18:09:32 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/integrate-to-your-app.md | 2 +-
doc/source/cn/guide/intro/app-architecture.md | 2 +-
doc/source/cn/guide/intro/how-it-works.md | 2 +-
doc/source/cn/guide/intro/index.md | 4 ++--
doc/source/cn/guide/intro/page-architecture.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/web-dev-experience.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 4 ++--
doc/source/cn/guide/set-up-env.md | 2 +-
doc/source/cn/guide/tools/devtools.md | 2 +-
doc/source/cn/guide/tools/index.md | 4 ++--
doc/source/cn/guide/tools/weexpack.md | 2 +-
doc/source/guide/integrate-to-your-app.md | 4 ++--
doc/source/guide/set-up-env.md | 2 +-
doc/themes/weex/languages/cn.yml | 3 +--
doc/themes/weex/languages/en.yml | 5 ++---
doc/themes/weex/layout/_partial/header.ejs | 10 +++++-----
doc/themes/weex/layout/_partial/sidebar.ejs | 9 ++++-----
18 files changed, 30 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[32/50] incubator-weex git commit: Merge branch
'website-feature-contributing' of http://github.com/Jinjiang/incubator-weex
into dev This closes #88
Posted by cx...@apache.org.
Merge branch 'website-feature-contributing' of http://github.com/Jinjiang/incubator-weex into dev
This closes #88
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e2e90cdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e2e90cdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e2e90cdb
Branch: refs/heads/0.11-dev
Commit: e2e90cdb87b6fbb5d5b82ce6244a757ec4016b54
Parents: 2d7b868 7cbf3cc
Author: sospartan <so...@gmail.com>
Authored: Fri Mar 10 17:52:37 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Fri Mar 10 17:52:37 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 38 ++++++-----
doc/source/cn/guide/contributing.md | 106 +++++++++++++++++++++++++++++++
doc/source/guide/contributing.md | 106 +++++++++++++++++++++++++++++++
3 files changed, 234 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[27/50] incubator-weex git commit: * [website] Updated contributing.md
Posted by cx...@apache.org.
* [website] Updated contributing.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7cbf3cc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7cbf3cc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7cbf3cc1
Branch: refs/heads/0.11-dev
Commit: 7cbf3cc175ffc05f1ccddef8fb2b32f317bbb947
Parents: 090244c
Author: Jinjiang <zh...@me.com>
Authored: Fri Mar 10 16:56:24 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Fri Mar 10 16:56:24 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/contributing.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7cbf3cc1/doc/source/cn/guide/contributing.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/contributing.md b/doc/source/cn/guide/contributing.md
index 4ef9882..36db1f9 100644
--- a/doc/source/cn/guide/contributing.md
+++ b/doc/source/cn/guide/contributing.md
@@ -12,9 +12,7 @@ version: 2.1
\u5728 Weex \u5b98\u65b9\u793e\u533a\u6240\u6709\u7684\u4fe1\u606f\u90fd\u4f1a\u6c47\u805a\u4e8e\u90ae\u4ef6\u5217\u8868\u3002\u8ba2\u9605\u5f00\u53d1\u90ae\u4ef6\u5217\u8868\u7684\u65b9\u5f0f\u662f\u53d1\u9001\u90ae\u4ef6\u5230 `dev-subscribe@weex.incubator.apache.org` \u7136\u540e\u4f60\u7684\u90ae\u7bb1\u4f1a\u6536\u5230\u4e00\u5c01\u6765\u81ea Apache \u7684\u56de\u4fe1 (\u82f1\u6587)\uff0c\u628a Apache \u7684\u8fd9\u5c01\u56de\u4fe1\u518d\u6b21\u56de\u590d\u8fc7\u53bb\uff0c\u5373\u53ef\u5b8c\u6210\u8ba2\u9605\u3002
-\u8fd9\u91cc\u9700\u8981\u5f3a\u8c03\u7684\u662f Apache \u662f\u4e00\u4e2a\u9762\u5411\u5168\u7403\u7684\u5168\u82f1\u6587\u7684\u793e\u533a\uff0c\u6240\u4ee5\u6211\u4eec\u5e0c\u671b\u60a8\u80fd\u591f\u7528\u82f1\u6587\u5728\u90ae\u4ef6\u5217\u8868\u4e2d\u8ddf\u5927\u5bb6\u4ea4\u6d41\u3002\u6211\u4eec\u6b22\u8fce\u4efb\u4f55\u8ba8\u8bba\uff0cApache \u793e\u533a\u7684\u6bcf\u4e00\u4f4d\u53c2\u4e0e\u8005\u90fd\u975e\u5e38\u53cb\u5584\u5e76\u4e14\u5177\u6709\u6781\u5927\u7684\u5305\u5bb9\u5fc3\uff0c\u60a8\u4e0d\u5fc5\u591a\u8651\u81ea\u5df1\u53ef\u80fd\u4f1a\u9047\u5230\u7684\u4efb\u4f55\u8bed\u8a00\u969c\u788d\u3002\u518d\u6b21\u5f3a\u8c03\uff0c\u6211\u4eec\u9f13\u52b1\u5927\u5bb6\u53c2\u4e0e\u90ae\u4ef6\u5217\u8868\u8ba8\u8bba\uff0c\u5e0c\u671b\u66f4\u591a\u7684\u4e2d\u6587\u7528\u6237\u80fd\u591f\u514b\u670d\u8bed\u8a00\u969c\u788d\uff0c\u6811\u7acb\u4f7f\u7528\u5916\u8bed\u7684\u81ea\u4fe1\u5fc3\uff01
-
-\u6211\u4eec\u540c\u65f6\u5efa\u8bae\u5927\u5bb6\u901a\u8fc7\u5e02\u9762\u4e0a\u4e3b\u6d41\u7684\u7ffb\u8bd1\u8f6f\u4ef6\u548c\u5de5\u5177\u6765\u5e2e\u52a9\u81ea\u5df1\u64b0\u5199\u548c\u9605\u8bfb\u82f1\u6587\u3002
+\u8fd9\u91cc\u9700\u8981\u5f3a\u8c03\u7684\u662f Apache \u662f\u4e00\u4e2a\u9762\u5411\u5168\u7403\u7684\u5168\u82f1\u6587\u7684\u793e\u533a\uff0c\u6240\u4ee5\u6211\u4eec\u5e0c\u671b\u60a8\u80fd\u591f\u7528\u82f1\u6587\u5728\u90ae\u4ef6\u5217\u8868\u4e2d\u8ddf\u5927\u5bb6\u4ea4\u6d41\u3002
\u5982\u679c\u60a8\u786e\u5b9e\u5bf9\u4f7f\u7528\u82f1\u6587\u5b58\u5728\u5f88\u5927\u7684\u7591\u8651\u6216\u56f0\u60d1\uff0c\u6211\u4eec\u4e5f\u975e\u5e38\u6b22\u8fce\u5927\u5bb6\u6765\u4e2d\u6587\u95ee\u7b54\u5e73\u53f0 [SegmentFault](https://segmentfault.com/t/weex) \u63d0\u95ee\uff0c\u8fd9\u91cc\u6709\u975e\u5e38\u591a\u70ed\u5fc3\u7684\u5f00\u53d1\u8005\u4e00\u8d77\u8ba8\u8bba\u548c\u89e3\u7b54 Weex \u76f8\u5173\u7684\u95ee\u9898\u3002
[31/50] incubator-weex git commit: Update integrate-to-your-app.md
Posted by cx...@apache.org.
Update integrate-to-your-app.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/934fd097
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/934fd097
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/934fd097
Branch: refs/heads/0.11-dev
Commit: 934fd09735acad12434e6cc664d647d149c960a2
Parents: 833c7df
Author: \u52fe\u4e09\u80a1\u56db <zh...@me.com>
Authored: Fri Mar 10 17:11:12 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Mar 10 17:11:12 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/integrate-to-your-app.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/934fd097/doc/source/cn/guide/integrate-to-your-app.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/integrate-to-your-app.md b/doc/source/cn/guide/integrate-to-your-app.md
index 3461aa7..18bd5bb 100644
--- a/doc/source/cn/guide/integrate-to-your-app.md
+++ b/doc/source/cn/guide/integrate-to-your-app.md
@@ -1,7 +1,7 @@
---
title: \u96c6\u6210 Weex \u5230\u5df2\u6709\u5e94\u7528
type: guide
-order: 3
+order: 1.2
version: 2.1
has_chapter_content: true
---
[38/50] incubator-weex git commit: * [ios] bugfix incorrect code
Posted by cx...@apache.org.
* [ios] bugfix incorrect code
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/00d795e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/00d795e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/00d795e1
Branch: refs/heads/0.11-dev
Commit: 00d795e16026161871e9c1de99d2aec8d75d4116
Parents: 2d7b868
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 13 11:59:35 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 13 11:59:35 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/00d795e1/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index dfbdb1b..1e0e7a3 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -223,8 +223,6 @@
[self _registerDefaultModules];
[self _registerDefaultHandlers];
});
-
- [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"taobao://"]];
}
+ (NSString*)SDKEngineVersion
[16/50] incubator-weex git commit: Merge branch 'dev-cell-doc' of
https://github.com/xkli/incubator-weex into dev This closes #29
Posted by cx...@apache.org.
Merge branch 'dev-cell-doc' of https://github.com/xkli/incubator-weex into dev
This closes #29
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/20d9d5f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/20d9d5f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/20d9d5f0
Branch: refs/heads/0.11-dev
Commit: 20d9d5f068e50eb32f410d5b1e3aca19a234707d
Parents: 422e6e9 dbe45be
Author: Jinjiang <zh...@me.com>
Authored: Wed Mar 8 14:03:03 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Wed Mar 8 14:03:03 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/cell.md | 3 +++
doc/source/references/components/cell.md | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
[44/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7344bf1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7344bf1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7344bf1c
Branch: refs/heads/0.11-dev
Commit: 7344bf1cf8fe8e94adae34393954bd942d28f64f
Parents: 1d41569 c6c6399
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 17 10:36:52 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 17 10:36:52 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Resources/main.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[21/50] incubator-weex git commit: * [website] Updated header menu
and link more tools internal.
Posted by cx...@apache.org.
* [website] Updated header menu and link more tools internal.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d8ab10b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d8ab10b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d8ab10b0
Branch: refs/heads/0.11-dev
Commit: d8ab10b06a26209ed832286c3ef0489eee9f779a
Parents: 1543a5c
Author: Jinjiang <zh...@me.com>
Authored: Fri Mar 10 10:19:16 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Fri Mar 10 10:19:26 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/cn.yml | 3 +--
doc/themes/weex/languages/en.yml | 5 ++---
doc/themes/weex/layout/_partial/header.ejs | 10 +++++-----
doc/themes/weex/layout/_partial/sidebar.ejs | 9 ++++-----
4 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8ab10b0/doc/themes/weex/languages/cn.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/cn.yml b/doc/themes/weex/languages/cn.yml
index 67f72e6..fe3bf17 100644
--- a/doc/themes/weex/languages/cn.yml
+++ b/doc/themes/weex/languages/cn.yml
@@ -74,10 +74,9 @@ menu:
blog: \u535a\u5ba2
showcase: \u793a\u4f8b
download: \u4e0b\u8f7d
- resources: \u4e0b\u8f7d
+ resources: \u8d44\u6e90
tools: \u5de5\u5177\u548c\u670d\u52a1
advanced: \u9ad8\u9636\u77e5\u8bc6
- baichuan: \u963f\u91cc\u767e\u5ddd
github: GitHub
legacy: \u65e7\u8bed\u6cd5\u6587\u6863
playground:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8ab10b0/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index 47ca0ec..7186784 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -75,10 +75,9 @@ menu:
blog: Blog
showcase: Showcase
download: Download
- resources: Download
- tools: Service & Tools
+ resources: Resources
+ tools: Services & Tools
advanced: Advanced
- baichuan: AliBaichuan
github: GitHub
legacy: Old Syntax Doc
playground:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8ab10b0/doc/themes/weex/layout/_partial/header.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/header.ejs b/doc/themes/weex/layout/_partial/header.ejs
index 9b2cdb6..8cd9631 100644
--- a/doc/themes/weex/layout/_partial/header.ejs
+++ b/doc/themes/weex/layout/_partial/header.ejs
@@ -9,19 +9,19 @@
<li><a href="<%= url_for_lang('references') %>"><%= _p('menu.references') %></a></li>
<li><a href="<%= url_for_lang('faq.html') %>"><%= _p('menu.faq') %></a></li>
<li class="dropdown">
- <a href="javascript:;"><%= _p('menu.resources') %></a>
+ <a href="javascript:;"><%= _p('menu.tools') %></a>
<ul class="dropdown-menu subnav">
<li>
<a href="<%= url_for_lang('playground.html') %>">Playground</a>
</li>
<li>
- <a href="https://www.npmjs.com/package/weex-devtool" target="_blank">Devtool</a>
+ <a href="<%= url_for_lang('guide/tools/devtools.html') %>">Devtools</a>
</li>
<li>
- <a href="https://www.npmjs.com/package/weexpack" target="_blank">Weexpack</a>
+ <a href="<%= url_for_lang('guide/tools/weexpack.html') %>">Weexpack</a>
</li>
<li>
- <a href="http://dotwe.org" target="_blank">Snippets</a>
+ <a href="http://dotwe.org" target="_blank">Code Snippets</a>
</li>
<li>
<a href="https://market.weex-project.io/" target="_blank">Market</a>
@@ -62,4 +62,4 @@
</a>
<a class="btn-menu"><span class="iconfont icon-nav"></span></a>
</div>
-</header>
\ No newline at end of file
+</header>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d8ab10b0/doc/themes/weex/layout/_partial/sidebar.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/sidebar.ejs b/doc/themes/weex/layout/_partial/sidebar.ejs
index 2287671..e2ae986 100644
--- a/doc/themes/weex/layout/_partial/sidebar.ejs
+++ b/doc/themes/weex/layout/_partial/sidebar.ejs
@@ -24,21 +24,20 @@
</a>
</li>
<li>
- <p><%= _p('menu.resources') %></p>
+ <p><%= _p('menu.tools') %></p>
<ul class="subnav">
<li>
<a href="<%= url_for_lang('playground.html') %>">Playground</a>
</li>
<li>
- <a href="https://www.npmjs.com/package/weex-devtool" target="_blank">Devtool</a>
+ <a href="<%= url_for_lang('guide/tools/devtools.html') %>">Devtools</a>
</li>
<li>
- <a href="https://www.npmjs.com/package/weexpack" target="_blank">Weexpack</a>
+ <a href="<%= url_for_lang('guide/tools/weexpack.html') %>">Weexpack</a>
</li>
<li>
<a href="http://dotwe.org" target="_blank">Snippets</a>
</li>
- </li>
<li>
<a href="https://market.weex-project.io/" target="_blank">Market</a>
</li>
@@ -53,4 +52,4 @@
<% } %>
<a class="btn-close-sidebar iconfont icon-close"></a>
</div>
-</div>
\ No newline at end of file
+</div>
[39/50] incubator-weex git commit: Merge branch 'dev' of
http://github.com/acton393/incubator-weex into dev This closes #94
Posted by cx...@apache.org.
Merge branch 'dev' of http://github.com/acton393/incubator-weex into dev
This closes #94
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1cbdcb5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1cbdcb5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1cbdcb5e
Branch: refs/heads/0.11-dev
Commit: 1cbdcb5eda13bd5b329242304370265652cc3ddf
Parents: ba3ed78 00d795e
Author: sospartan <so...@gmail.com>
Authored: Mon Mar 13 12:30:49 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Mon Mar 13 12:30:49 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
[10/50] incubator-weex git commit: * [doc] update cell attrabute
Posted by cx...@apache.org.
* [doc] update cell attrabute
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/be6801e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/be6801e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/be6801e2
Branch: refs/heads/0.11-dev
Commit: be6801e20bef35d01193f49c359184fc7204a3ba
Parents: ea30e05
Author: xkli <56...@qq.com>
Authored: Mon Mar 6 10:53:35 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Mon Mar 6 10:53:35 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/cell.md | 2 +-
doc/source/references/components/cell.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/be6801e2/doc/source/cn/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/cell.md b/doc/source/cn/references/components/cell.md
index 5fadf5d..95a3e83 100644
--- a/doc/source/cn/references/components/cell.md
+++ b/doc/source/cn/references/components/cell.md
@@ -14,7 +14,7 @@ version: 2.1
\u652f\u6301\u6240\u6709 Weex \u7684\u7ec4\u4ef6\u4f5c\u4e3a\u5b83\u7684\u5b50\u7ec4\u4ef6\u3002
## \u5c5e\u6027
-* `keep-scroll-position`: <span class="api-version">v0.11+</span> <boolen> List \u63d2\u5165\u6570\u636e\u540e\u662f\u5426\u4fdd\u6301\u4e0a\u6b21\u6eda\u52a8\u7684\u4f4d\u7f6e
+* `keep-scroll-position {boolen}`: <span class="api-version">v0.11+</span> List \u63d2\u5165\u6570\u636e\u540e\u662f\u5426\u4fdd\u6301\u4e0a\u6b21\u6eda\u52a8\u7684\u4f4d\u7f6e
## \u6837\u5f0f
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/be6801e2/doc/source/references/components/cell.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/cell.md b/doc/source/references/components/cell.md
index 38cfd9b..14b2572 100644
--- a/doc/source/references/components/cell.md
+++ b/doc/source/references/components/cell.md
@@ -19,7 +19,7 @@ This type of component supports all kinds of weex component as its child compone
**Notes:** you can't give `<cell>` a `flex` value. Width of `<cell>` is equal to the width of its parent component `<list>`, and you don't need to specify its height.
-* `keep-scroll-position`: <span class="api-version">v0.11+</span> <boolen> List Whether to keep the last sliding position after inserting the Cell
+* `keep-scroll-position {boolen}`: <span class="api-version">v0.11+</span> List Whether to keep the last sliding position after inserting the Cell
### Styles
[35/50] incubator-weex git commit: Merge branch 'update-github-link'
of https://github.com/DoranYun/incubator-weex into dev This closes #71
Posted by cx...@apache.org.
Merge branch 'update-github-link' of https://github.com/DoranYun/incubator-weex into dev
This closes #71
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5d44c418
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5d44c418
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5d44c418
Branch: refs/heads/0.11-dev
Commit: 5d44c418d56d3ca6de6191200bf1e9b7570b3f7c
Parents: 38dc38d 0f97d7c
Author: Jinjiang <zh...@me.com>
Authored: Mon Mar 13 11:41:04 2017 +0800
Committer: Jinjiang <zh...@me.com>
Committed: Mon Mar 13 11:41:04 2017 +0800
----------------------------------------------------------------------
doc/source/cn/faq.md | 2 +-
doc/source/cn/guide/integrate-to-your-app.md | 4 ++--
doc/source/cn/references/modules/storage.md | 2 +-
doc/source/cn/references/modules/websocket.md | 6 +++---
doc/source/cn/v-0.10/advanced/extend-to-html5.md | 2 +-
doc/source/cn/v-0.10/advanced/integrate-to-android.md | 4 ++--
doc/source/cn/v-0.10/references/modules/storage.md | 2 +-
doc/source/cn/v-0.10/tools/devtools.md | 4 ++--
doc/source/faq.md | 2 +-
doc/source/references/modules/websocket.md | 6 +++---
doc/source/v-0.10/advanced/extend-to-html5.md | 2 +-
doc/source/v-0.10/advanced/integrate-to-android.md | 6 +++---
doc/source/v-0.10/guide/how-to/preview-in-playground-app.md | 2 +-
doc/themes/weex/layout/_partial/header.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 2 +-
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
16 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5d44c418/doc/source/cn/guide/integrate-to-your-app.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5d44c418/doc/themes/weex/layout/_partial/header.ejs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5d44c418/doc/themes/weex/layout/_partial/sidebar.ejs
----------------------------------------------------------------------
[45/50] incubator-weex git commit: * [ios] public WXAcomponent.h
Posted by cx...@apache.org.
* [ios] public WXAcomponent.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f2241ffd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f2241ffd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f2241ffd
Branch: refs/heads/0.11-dev
Commit: f2241ffd99ec488b223b3365e02d300737dd3011
Parents: 7344bf1
Author: acton393 <zh...@gmail.com>
Authored: Fri Mar 17 13:33:20 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Mar 17 13:33:20 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f2241ffd/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 02ec8d7..e0b84fb 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -32,7 +32,7 @@
2AAFC1B61C48DFF70026D2FE /* WXSDKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AAFC1B41C48DFF70026D2FE /* WXSDKError.h */; settings = {ATTRIBUTES = (Public, ); }; };
2AC750241C7565690041D390 /* WXIndicatorComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC750221C7565690041D390 /* WXIndicatorComponent.h */; };
2AC750251C7565690041D390 /* WXIndicatorComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC750231C7565690041D390 /* WXIndicatorComponent.m */; };
- 2AE5B7521CAB7DBD0082FDDB /* WXAComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AE5B7501CAB7DBD0082FDDB /* WXAComponent.h */; };
+ 2AE5B7521CAB7DBD0082FDDB /* WXAComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AE5B7501CAB7DBD0082FDDB /* WXAComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
2AE5B7531CAB7DBD0082FDDB /* WXAComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AE5B7511CAB7DBD0082FDDB /* WXAComponent.m */; };
2AE5B7561CABA04E0082FDDB /* WXEventModuleProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AE5B7551CABA04E0082FDDB /* WXEventModuleProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
2AFEB17B1C747139000507FA /* WXInstanceWrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AFEB1791C747139000507FA /* WXInstanceWrap.h */; };
[41/50] incubator-weex git commit: * [site] Update market link.
Posted by cx...@apache.org.
* [site] Update market link.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9745b74b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9745b74b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9745b74b
Branch: refs/heads/0.11-dev
Commit: 9745b74b4dd09c94f4a848a62c980d021b49922d
Parents: c62bcfe
Author: Yun Dong <yu...@gmail.com>
Authored: Thu Mar 16 16:55:56 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Thu Mar 16 16:55:56 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/layout/_partial/header.ejs | 2 +-
doc/themes/weex/layout/_partial/sidebar.ejs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9745b74b/doc/themes/weex/layout/_partial/header.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/header.ejs b/doc/themes/weex/layout/_partial/header.ejs
index c57b4b4..c2743dc 100644
--- a/doc/themes/weex/layout/_partial/header.ejs
+++ b/doc/themes/weex/layout/_partial/header.ejs
@@ -24,7 +24,7 @@
<a href="http://dotwe.org" target="_blank">Code Snippets</a>
</li>
<li>
- <a href="https://market.weex-project.io/" target="_blank">Market</a>
+ <a href="https://market.dotwe.org" target="_blank">Market</a>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9745b74b/doc/themes/weex/layout/_partial/sidebar.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/_partial/sidebar.ejs b/doc/themes/weex/layout/_partial/sidebar.ejs
index 72b155a..3074b4a 100644
--- a/doc/themes/weex/layout/_partial/sidebar.ejs
+++ b/doc/themes/weex/layout/_partial/sidebar.ejs
@@ -39,7 +39,7 @@
<a href="http://dotwe.org" target="_blank">Snippets</a>
</li>
<li>
- <a href="https://market.weex-project.io/" target="_blank">Market</a>
+ <a href="https://market.dotwe.org" target="_blank">Market</a>
</li>
</ul>
</li>
[43/50] incubator-weex git commit: * [ios] remove unused function
Posted by cx...@apache.org.
* [ios] remove unused function
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1d41569b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1d41569b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1d41569b
Branch: refs/heads/0.11-dev
Commit: 1d41569ba19986ec3289e93878f254696027ab6e
Parents: 571bfd1
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 16 21:25:08 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 16 21:25:08 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h | 1 -
ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m | 12 ------------
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d41569b/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h b/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h
index 1bcef92..c04432e 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h
@@ -20,7 +20,6 @@
@property (nonatomic, strong) NSMutableDictionary *asyncMethods;
@property (nonatomic, strong) NSMutableDictionary *syncMethods;
-+ (instancetype)sharedInstance;
- (instancetype)initWithName:(NSString *)name class:(NSString *)clazz;
- (void)registerMethods;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d41569b/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m b/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m
index e725fc1..c5171df 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m
@@ -24,17 +24,6 @@
@implementation WXInvocationConfig
-+ (instancetype)sharedInstance
-{
- static id _sharedInstance;
- static dispatch_once_t onceToken;
- dispatch_once(&onceToken, ^{
- _sharedInstance = [[self alloc] init];
- });
-
- return _sharedInstance;
-}
-
- (instancetype)init
{
@@ -106,5 +95,4 @@
}
-
@end
[13/50] incubator-weex git commit: * [doc] Change the guide directory
structure: Add a new type 'tools'.
Posted by cx...@apache.org.
* [doc] Change the guide directory structure: Add a new type 'tools'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9dd6bdd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9dd6bdd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9dd6bdd4
Branch: refs/heads/0.11-dev
Commit: 9dd6bdd42130d12a7e9f3201d38c079914175381
Parents: 6dc87a7
Author: Yun Dong <yu...@gmail.com>
Authored: Mon Mar 6 15:47:27 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Mon Mar 6 15:47:27 2017 +0800
----------------------------------------------------------------------
doc/source/cn/guide/dev-with-weexpack.md | 11 -
doc/source/cn/guide/index.md | 114 ------
doc/source/cn/guide/intro/app-architecture.md | 2 +-
doc/source/cn/guide/intro/devtools.md | 99 -----
doc/source/cn/guide/intro/how-it-works.md | 2 +-
doc/source/cn/guide/intro/index.md | 2 +-
doc/source/cn/guide/intro/page-architecture.md | 2 +-
doc/source/cn/guide/intro/using-vue.md | 2 +-
doc/source/cn/guide/intro/web-dev-experience.md | 2 +-
doc/source/cn/guide/intro/write-once.md | 2 +-
doc/source/cn/guide/set-up-env.md | 126 ++++++
doc/source/cn/guide/tools/devtools.md | 111 ++++++
doc/source/cn/guide/tools/index.md | 11 +
doc/source/cn/guide/tools/weexpack.md | 388 +++++++++++++++++++
doc/source/cn/references/common-style.md | 11 +-
doc/source/cn/references/components/scroller.md | 8 +-
doc/source/guide/dev-with-weexpack.md | 12 -
doc/source/guide/index.md | 52 ---
doc/source/guide/intro/app-architecture.md | 2 +-
doc/source/guide/intro/devtools.md | 2 +-
doc/source/guide/intro/how-it-works.md | 2 +-
doc/source/guide/intro/index.md | 2 +-
doc/source/guide/intro/page-architecture.md | 2 +-
doc/source/guide/intro/using-vue.md | 2 +-
doc/source/guide/intro/web-dev-experience.md | 2 +-
doc/source/guide/intro/write-once.md | 2 +-
doc/source/guide/set-up-env.md | 93 +++++
doc/source/guide/tools/devtools.md | 100 +++++
doc/source/guide/tools/index.md | 11 +
doc/source/guide/tools/weexpack.md | 298 ++++++++++++++
30 files changed, 1163 insertions(+), 312 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/dev-with-weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/dev-with-weexpack.md b/doc/source/cn/guide/dev-with-weexpack.md
deleted file mode 100644
index 2f39204..0000000
--- a/doc/source/cn/guide/dev-with-weexpack.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: \u6784\u5efa\u5168\u65b0\u5e94\u7528
-type: guide
-order: 2
-version: 2.1
-has_chapter_content: true
----
-
-# \u6784\u5efa\u5168\u65b0\u5e94\u7528
-
-Work in process.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/index.md b/doc/source/cn/guide/index.md
index e2d43e4..22670ed 100644
--- a/doc/source/cn/guide/index.md
+++ b/doc/source/cn/guide/index.md
@@ -54,117 +54,3 @@ Vue.js \u662f Evan You \u5f00\u53d1\u7684\u6e10\u8fdb\u5f0f JavaScript \u6846\u67b6\u3002\u5f00\u53d1\u8005\u80fd\u591f\u901a\u8fc7
```
\u6211\u4eec\u6682\u65f6\u4e0d\u53bb\u5173\u5fc3 Weex \u7684\u6280\u672f\u7ec6\u8282\uff0c\u4ec5\u770b\u5927\u81f4\u7684\u4ee3\u7801\u7ed3\u6784\uff0c\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u8bed\u6cd5\u5c31\u662f\u6211\u4eec\u719f\u6089\u7684 Vue\u3002\u4f60\u53ef\u4ee5\u4fee\u6539\u8fd9\u4e2a\u4f8b\u5b50\uff0c\u518d\u6b21\u626b\u7801\u5c1d\u8bd5\u3002
-
-## \u642d\u5efa\u5f00\u53d1\u73af\u5883
-
-\u4f7f\u7528 dotWe \u5bf9 Weex \u5c1d\u9c9c\u662f\u4e00\u4e2a\u4e0d\u9519\u7684\u9009\u62e9\uff0c\u4f46\u5982\u679c\u4f60\u60f3\u66f4\u4e13\u4e1a\u7684\u5f00\u53d1 Weex\uff0c dotWe \u5c31\u4e0d\u600e\u4e48\u591f\u7528\u4e86\u3002\u672c\u8282\u4f1a\u6559\u4f60\u5982\u4f55\u642d\u5efa\u672c\u5730\u5f00\u53d1\u73af\u5883\u8fdb\u884c Weex \u5f00\u53d1\u3002
-
-### \u7b2c\u4e00\u6b65\uff1a\u5b89\u88c5\u4f9d\u8d56
-
-Weex \u5b98\u65b9\u63d0\u4f9b\u4e86 weex-toolkit \u7684\u811a\u624b\u67b6\u5de5\u5177\u6765\u8f85\u52a9\u5f00\u53d1\u548c\u8c03\u8bd5\u3002\u9996\u5148\uff0c\u4f60\u9700\u8981 Node.js \u548c weex-toolkit\u3002
-
-\u5b89\u88c5 Node.js \u65b9\u5f0f\u591a\u79cd\u591a\u6837\uff0c\u6700\u7b80\u5355\u7684\u65b9\u5f0f\u662f\u5728 [Node.js \u5b98\u7f51](https://nodejs.org/en/) \u4e0b\u8f7d\u53ef\u6267\u884c\u7a0b\u5e8f\u76f4\u63a5\u5b89\u88c5\u5373\u53ef\u3002
-
-\u5bf9\u4e8e Mac\uff0c\u53ef\u4ee5\u4f7f\u7528 [Homebrew](http://brew.sh/) \u8fdb\u884c\u5b89\u88c5\uff1a
-
-```bash
-brew install node
-```
-
-> \u66f4\u591a\u5b89\u88c5\u65b9\u5f0f\u53ef\u53c2\u8003 [Node.js \u5b98\u65b9\u4fe1\u606f](https://nodejs.org/en/download/)
-
-\u5b89\u88c5\u5b8c\u6210\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u68c0\u6d4b\u662f\u5426\u5b89\u88c5\u6210\u529f\uff1a
-
-```bash
-$ node -v
-v6.3.1
-$ npm -v
-3.10.3
-```
-
-\u901a\u5e38\uff0c\u5b89\u88c5\u4e86 Node.js \u73af\u5883\uff0cnpm \u5305\u7ba1\u7406\u5de5\u5177\u4e5f\u968f\u4e4b\u5b89\u88c5\u4e86\u3002\u56e0\u6b64\uff0c\u76f4\u63a5\u4f7f\u7528 npm \u6765\u5b89\u88c5 weex-toolkit\u3002
-
-> npm \u662f\u4e00\u4e2a JavaScript \u5305\u7ba1\u7406\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u8ba9\u5f00\u53d1\u8005\u8f7b\u677e\u5171\u4eab\u548c\u91cd\u7528\u4ee3\u7801\u3002Weex \u5f88\u591a\u4f9d\u8d56\u6765\u81ea\u793e\u533a\uff0c\u540c\u6837\uff0cWeex \u4e5f\u5c06\u5f88\u591a\u5de5\u5177\u53d1\u5e03\u5230\u793e\u533a\u65b9\u4fbf\u5f00\u53d1\u8005\u4f7f\u7528\u3002
-
-**\u6ce8\u610f: ** weex-toolkit \u76ee\u524d\u4ec5\u6709\u6700\u65b0\u7684 beta \u7248\u672c\u5f00\u59cb\u624d\u652f\u6301\u521d\u59cb\u5316 Vue \u9879\u76ee\uff0c\u4f7f\u7528\u524d\u8bf7\u786e\u8ba4\u7248\u672c\u662f\u5426\u6b63\u786e\u3002
-
-```bash
-$ npm install -g weex-toolkit@beta
-```
-
-\u56fd\u5185\u5f00\u53d1\u8005\u53ef\u4ee5\u8003\u8651\u4f7f\u7528\u6dd8\u5b9d\u7684 npm \u955c\u50cf \u2014\u2014 [cnpm](https://npm.taobao.org/) \u5b89\u88c5 weex-toolkit
-
-```bash
-$ npm install -g cnpm
-$ cnpm install -g weex-toolkit@beta
-```
-
-*\u63d0\u793a\uff1a*
-
-\u5982\u679c\u63d0\u793a\u6743\u9650\u9519\u8bef\uff08*permission error*\uff09\uff0c\u4f7f\u7528 `sudo` \u5173\u952e\u5b57\u8fdb\u884c\u5b89\u88c5
-
-```bash
-$ sudo cnpm install -g weex-toolkit@beta
-```
-
-\u5b89\u88c5\u7ed3\u675f\u540e\u4f60\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528 `weex` \u547d\u4ee4\u9a8c\u8bc1\u662f\u5426\u5b89\u88c5\u6210\u529f\uff0c\u5b83\u4f1a\u663e\u793a `weex` \u547d\u4ee4\u884c\u5de5\u5177\u5404\u53c2\u6570\uff1a
-
-
-
-### \u7b2c\u4e8c\u6b65\uff1a\u521d\u59cb\u5316
-
-\u7136\u540e\u521d\u59cb\u5316 Weex \u9879\u76ee\uff1a
-
-```bash
-$ weex init awesome-project
-```
-
-\u6267\u884c\u5b8c\u547d\u4ee4\u540e\uff0c\u5728 `awesome-project` \u76ee\u5f55\u4e2d\u5c31\u521b\u5efa\u4e86\u4e00\u4e2a\u4f7f\u7528 Weex \u548c Vue \u7684\u6a21\u677f\u9879\u76ee\u3002
-
-### \u7b2c\u4e09\u6b65\uff1a\u5f00\u53d1
-
-\u4e4b\u540e\u6211\u4eec\u8fdb\u5165\u9879\u76ee\u6240\u5728\u8def\u5f84\uff0cweex-toolkit \u5df2\u7ecf\u4e3a\u6211\u4eec\u751f\u6210\u4e86\u6807\u51c6\u9879\u76ee\u7ed3\u6784\u3002
-
-\u5728 `package.json` \u4e2d\uff0c\u5df2\u7ecf\u914d\u7f6e\u597d\u4e86\u51e0\u4e2a\u5e38\u7528\u7684 npm script\uff0c\u5206\u522b\u662f\uff1a
-
-- `build`: \u6e90\u7801\u6253\u5305\uff0c\u751f\u6210 JS Bundle
-- `dev`: webpack watch \u6a21\u5f0f\uff0c\u65b9\u4fbf\u5f00\u53d1
-- `serve`: \u5f00\u542f\u9759\u6001\u670d\u52a1\u5668
-- `debug`: \u8c03\u8bd5\u6a21\u5f0f
-
-\u6211\u4eec\u5148\u901a\u8fc7 `npm install` \u5b89\u88c5\u9879\u76ee\u4f9d\u8d56\u3002\u4e4b\u540e\u8fd0\u884c `npm run dev` \u548c `npm run serve` \u5f00\u542fwatch \u6a21\u5f0f\u548c\u9759\u6001\u670d\u52a1\u5668\u3002
-
-\u7136\u540e\u6211\u4eec\u6253\u5f00\u6d4f\u89c8\u5668\uff0c\u8fdb\u5165 `http://localhost:8080/index.html` \u5373\u53ef\u770b\u5230 weex h5 \u9875\u9762\u3002
-
-\u521d\u59cb\u5316\u65f6\u5df2\u7ecf\u4e3a\u6211\u4eec\u521b\u5efa\u4e86\u57fa\u672c\u7684\u793a\u4f8b\uff0c\u6211\u4eec\u53ef\u4ee5\u5728 `src/foo.vue` \u4e2d\u67e5\u770b\u3002
-
-\u4ee3\u7801\u5982\u4e0b\u6240\u793a\uff1a
-
-```html
-<template>
- <div class="wrapper">
- <text class="weex">Hello Weex !</text>
- <text class="vue">Hello Vue !</text>
- </div>
-</template>
-
-<style scoped>
- .wrapper {
- flex-direction: column;
- justify-content: center;
- }
- .weex {
- font-size: 60px;
- text-align: center;
- color: #1B90F7;
- }
- .vue {
- font-size: 60px;
- text-align: center;
- margin-top: 30px;
- color: #41B883;
- }
-</style>
-```
-
-\u5173\u4e8e Weex \u8bed\u6cd5\u90e8\u5206\uff0c\u4f60\u53ef\u4ee5\u76f4\u63a5\u53c2\u8003 [Vue Guide](https://vuejs.org/v2/guide/)\uff0c\u8fd9\u91cc\u4e0d\u518d\u91cd\u590d\u4ecb\u7ecd\u3002\u5982\u679c\u60a8\u60f3\u4e86\u89e3\u6709\u5173\u6280\u672f\u8be6\u60c5\u7684\u66f4\u591a\u4fe1\u606f\uff0c\u8bf7\u7ee7\u7eed\u9605\u8bfb\u4e0b\u4e00\u8282\u3002\u5e76\u4e14\u4e0d\u8981\u5fd8\u8bb0\u5728 dotWe \u5199\u4ee3\u7801\u5e76\u968f\u65f6\u9884\u89c8\u3002
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/app-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/app-architecture.md b/doc/source/cn/guide/intro/app-architecture.md
index a3f39ce..22fc35c 100644
--- a/doc/source/cn/guide/intro/app-architecture.md
+++ b/doc/source/cn/guide/intro/app-architecture.md
@@ -1,7 +1,7 @@
---
title: \u7528 Weex \u6784\u5efa\u79fb\u52a8\u5e94\u7528
type: guide
-order: 4.5
+order: 5.5
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/devtools.md b/doc/source/cn/guide/intro/devtools.md
deleted file mode 100644
index 4935e13..0000000
--- a/doc/source/cn/guide/intro/devtools.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-title: \u4f7f\u7528 Devtools
-type: guide
-order: 4.7
-version: 2.1
----
-
-# Devtools
-
-**weex devtools**\u662f\u4e13\u95e8\u4e3aweex\u5b9a\u5236\u7684\u4e00\u6b3e\u5b9e\u73b0\u4e86[**Chrome Debugging Protocol**](https://developer.chrome.com/devtools/docs/debugger-protocol)\u7684inspect/debug\u5de5\u5177\uff0c\u80fd\u591f\u5e2e\u52a9\u4f60\u5feb\u901f\u67e5\u770bapp\u8fd0\u884c\u72b6\u6001\u548c\u8c03\u8bd5weex\u4e2d\u7684Javascript\u4ee3\u7801\uff0c\u5f53\u524d\u652f\u6301**IOS**\u548c**Android**\u4e24\u4e2a\u5e73\u53f0\u3002
-## \u5b89\u88c5
-
-```
-$ npm install -g weex-toolkit
-```
-
-## \u7528\u6cd5
-
- weex debug [options] [we_file|bundles_dir]
-
- \u9009\u9879:
-
-```
--h, --help \u663e\u793a\u5e2e\u52a9
--V, --verbose \u663e\u793adebug\u670d\u52a1\u5668\u8fd0\u884c\u65f6\u7684\u5404\u79cdlog
--v, --version \u663e\u793a\u7248\u672c
--p, --port [port] \u8bbe\u7f6edebug\u670d\u52a1\u5668\u7aef\u53e3\u53f7 \u9ed8\u8ba4\u4e3a8088
--e, --entry [entry] debug\u4e00\u4e2a\u76ee\u5f55\u65f6,\u8fd9\u4e2a\u53c2\u6570\u6307\u5b9a\u6574\u4e2a\u76ee\u5f55\u7684\u5165\u53e3bundle\u6587\u4ef6,\u8fd9\u4e2abundle\u6587\u4ef6\u7684\u5730\u5740\u4f1a\u663e\u793a\u5728debug\u4e3b\u9875\u4e0a(\u4f5c\u4e3a\u4e8c\u7ef4\u7801)
--m, --mode [mode] \u8bbe\u7f6e\u6784\u5efawe\u6587\u4ef6\u7684\u65b9\u5f0f,transformer \u6700\u57fa\u7840\u7684\u98ce\u683c\u9002\u5408\u5355\u6587\u4ef6,loader:wepack\u98ce\u683c \u9002\u5408\u6a21\u5757\u5316\u7684\u591a\u6587\u4ef6.\u9ed8\u8ba4\u4e3atransformer
-```
-#### \u5f00\u542f\u8c03\u8bd5
-
-```
-$weex debug
-```
-
-\u5355\u7eaf\u542f\u52a8\u4e00\u4e2a\u8c03\u8bd5\u670d\u52a1\u5668,\u5e76\u540c\u65f6\u5524\u8d77chrome\u6d4f\u89c8\u5668\u6253\u5f00`\u8c03\u8bd5\u4e3b\u9875`.
-\u8fd9\u4e2a`\u8c03\u8bd5\u4e3b\u9875`\u4e0a\u4f1a\u6709\u4e00\u4e2a\u4e8c\u7ef4\u7801,\u4f7f\u7528Playground App\u626b\u8fd9\u4e2a\u4e8c\u7ef4\u7801\u53ef\u4ee5\u5f00\u542fPlayground\u8c03\u8bd5.
-\u5f00\u542f\u8c03\u8bd5\u540e,\u8bbe\u5907\u5217\u8868\u4e2d\u4f1a\u51fa\u73b0\u60a8\u7684\u8bbe\u5907,\u6839\u636e\u63d0\u793a\u8fdb\u884c\u540e\u7eed\u7684\u8c03\u8bd5\u64cd\u4f5c
-#### \u8c03\u8bd5 we\u6587\u4ef6
-
-```
-$weex debug your_weex.we
-```
-
-\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06your_weex.we\u7f16\u8bd1\u6210bundlejs\u6587\u4ef6 \u90e8\u7f72\u5230debug\u670d\u52a1\u5668
-\u5e76\u542f\u52a8debug\u670d\u52a1\u5668\u5982\u4e0a\u8ff0\u547d\u4ee4\u90a3\u6837.\u6253\u5f00\u7684`\u8c03\u8bd5\u4e3b\u9875`\u4f1a\u591a\u663e\u793a\u4e00\u4e2a\u4e8c\u7ef4\u7801,\u4f7f\u7528playground app
-\u626b\u8fd9\u4e2a\u7801\u53ef\u4ee5\u52a0\u8f7dyour_weex.we.(\u6ce8\u610f\u8981\u5148\u626b\u63cf\u5f00\u542f\u8c03\u8bd5\u7684\u90a3\u4e2a\u7801)
-\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u81ea\u52a8\u68c0\u6d4byour_weex.we\u6587\u4ef6\u53d8\u52a8,\u5982\u679c\u53d1\u73b0\u5185\u5bb9\u88ab\u4fee\u6539\u5219\u7acb\u5373\u91cd\u65b0\u7f16\u8bd1\u90e8\u7f72,\u5e76\u5237\u65b0debugger\u9875\u9762
-.
-#### \u8c03\u8bd5\u6574\u4e2abundle/we\u6587\u4ef6\u5939
-
-```
-$weex debug your/we/path -e index.we
-```
-
-\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u7f16\u8bd1\u4f60\u6307\u5b9a\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u7684we\u6587\u4ef6,\u5e76\u628a\u7f16\u8bd1\u597d\u7684bundlejs\u90e8\u7f72\u5230debug\u670d\u52a1\u5668,\u4ed6\u4eec\u7684\u5730\u5740\u4f1a\u6620\u5c04\u5230 http://lcoalhost:8088/weex/ \u4e0b
-\u6bd4\u5982 your/we/path/`index.we` \u53ef\u4ee5\u901a\u8fc7http://lcoalhost:8088/weex/index.js\u8bbf\u95ee
-your/we/path/`demo/test.we` \u53ef\u4ee5\u901a\u8fc7http://lcoalhost:8088/weex/demo/index.js
-
--e\u53c2\u6570\u53ef\u4ee5\u6307\u5b9a\u4e00\u4e2a\u5165\u53e3\u7684we\u6587\u4ef6,\u8fd9\u4e2a\u6587\u4ef6\u7684\u5730\u5740\u4f1a\u663e\u793a\u5728`\u8c03\u8bd5\u4e3b\u9875`\u4e0a(\u4f5c\u4e3a\u4e8c\u7ef4\u7801)
-## \u7279\u6027
-### \u8fde\u63a5\u8bbe\u5907
-
-
-### Inspector
-
- Inspector \u80fd\u591f\u7528\u6765\u67e5\u770b `Element` \ `NetWork` \ `Console log` \ `ScreenCast` \ `BoxModel` \ `Native View` \u7b49\u3002
-
-
-#### Element
-
-
-#### NetWork
-##### \u67e5\u770b\u7f51\u7edc\u8bf7\u6c42\u7684\u603b\u8017\u65f6\u548c\u5ef6\u65f6
-
-
-##### \u67e5\u770b\u7f51\u7edc\u8bf7\u6c42\u7684header\u548cresponse
-
-
-#### \u63a7\u5236\u53f0
-
-
-#### \u8d44\u6e90
-
-
-### Debugger
-
- \u8c03\u8bd5\u5668\u7528\u6765\u8c03\u8bd5weex\u4e2d\u7684js\u4ee3\u7801\uff0c\u80fd\u591f\u8bbe\u7f6e\u65ad\u70b9\u3001\u67e5\u770b\u8c03\u7528\u6808\u3002
-
-
-##### Breakpoint and CallStack
-
-
-#### \u96c6\u6210devtools
-- Android
- - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
-- IOS
- - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/how-it-works.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/how-it-works.md b/doc/source/cn/guide/intro/how-it-works.md
index 4480005..51319e1 100644
--- a/doc/source/cn/guide/intro/how-it-works.md
+++ b/doc/source/cn/guide/intro/how-it-works.md
@@ -1,7 +1,7 @@
---
title: \u5de5\u4f5c\u539f\u7406
type: guide
-order: 4.1
+order: 5.1
has_chapter_content: false
chapter_title: \u4f18\u52bf\u4ecb\u7ecd
version: 2.1
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/index.md b/doc/source/cn/guide/intro/index.md
index 1ebcb4b..90e01a4 100644
--- a/doc/source/cn/guide/intro/index.md
+++ b/doc/source/cn/guide/intro/index.md
@@ -1,7 +1,7 @@
---
title: \u4ecb\u7ecd
type: guide
-order: 4
+order: 5
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/page-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/page-architecture.md b/doc/source/cn/guide/intro/page-architecture.md
index 296ee98..17b7d16 100644
--- a/doc/source/cn/guide/intro/page-architecture.md
+++ b/doc/source/cn/guide/intro/page-architecture.md
@@ -1,7 +1,7 @@
---
title: Weex \u9875\u9762\u7ed3\u6784
type: guide
-order: 4.6
+order: 5.6
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/using-vue.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/using-vue.md b/doc/source/cn/guide/intro/using-vue.md
index 3083340..42ad984 100644
--- a/doc/source/cn/guide/intro/using-vue.md
+++ b/doc/source/cn/guide/intro/using-vue.md
@@ -1,7 +1,7 @@
---
title: \u4f7f\u7528 Vue \u5f00\u53d1 Weex \u9875\u9762
type: guide
-order: 4.3
+order: 5.3
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/web-dev-experience.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/web-dev-experience.md b/doc/source/cn/guide/intro/web-dev-experience.md
index 03d33e4..d7f6163 100644
--- a/doc/source/cn/guide/intro/web-dev-experience.md
+++ b/doc/source/cn/guide/intro/web-dev-experience.md
@@ -1,7 +1,7 @@
---
title: Web \u5f00\u53d1\u4f53\u9a8c
type: guide
-order: 4.2
+order: 5.2
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/intro/write-once.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/intro/write-once.md b/doc/source/cn/guide/intro/write-once.md
index b5ecf07..e880f48 100644
--- a/doc/source/cn/guide/intro/write-once.md
+++ b/doc/source/cn/guide/intro/write-once.md
@@ -1,7 +1,7 @@
---
title: \u4e00\u6b21\u64b0\u5199\uff0c\u591a\u7aef\u8fd0\u884c
type: guide
-order: 4.4
+order: 5.4
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/set-up-env.md b/doc/source/cn/guide/set-up-env.md
new file mode 100644
index 0000000..79ff249
--- /dev/null
+++ b/doc/source/cn/guide/set-up-env.md
@@ -0,0 +1,126 @@
+---
+title: \u642d\u5efa\u5f00\u53d1\u73af\u5883
+type: guide
+order: 2
+version: 2.1
+has_chapter_content: true
+---
+
+# \u642d\u5efa\u5f00\u53d1\u73af\u5883
+
+\u4f7f\u7528 dotWe \u5bf9 Weex \u5c1d\u9c9c\u662f\u4e00\u4e2a\u4e0d\u9519\u7684\u9009\u62e9\uff0c\u4f46\u5982\u679c\u4f60\u60f3\u66f4\u4e13\u4e1a\u7684\u5f00\u53d1 Weex\uff0c dotWe \u5c31\u4e0d\u600e\u4e48\u591f\u7528\u4e86\u3002\u672c\u8282\u4f1a\u6559\u4f60\u5982\u4f55\u642d\u5efa\u672c\u5730\u5f00\u53d1\u73af\u5883\u8fdb\u884c Weex \u5f00\u53d1\u3002
+
+## \u7b2c\u4e00\u6b65\uff1a\u5b89\u88c5\u4f9d\u8d56
+
+Weex \u5b98\u65b9\u63d0\u4f9b\u4e86 weex-toolkit \u7684\u811a\u624b\u67b6\u5de5\u5177\u6765\u8f85\u52a9\u5f00\u53d1\u548c\u8c03\u8bd5\u3002\u9996\u5148\uff0c\u4f60\u9700\u8981 Node.js \u548c weex-toolkit\u3002
+
+\u5b89\u88c5 Node.js \u65b9\u5f0f\u591a\u79cd\u591a\u6837\uff0c\u6700\u7b80\u5355\u7684\u65b9\u5f0f\u662f\u5728 [Node.js \u5b98\u7f51](https://nodejs.org/en/) \u4e0b\u8f7d\u53ef\u6267\u884c\u7a0b\u5e8f\u76f4\u63a5\u5b89\u88c5\u5373\u53ef\u3002
+
+\u5bf9\u4e8e Mac\uff0c\u53ef\u4ee5\u4f7f\u7528 [Homebrew](http://brew.sh/) \u8fdb\u884c\u5b89\u88c5\uff1a
+
+```bash
+brew install node
+```
+
+> \u66f4\u591a\u5b89\u88c5\u65b9\u5f0f\u53ef\u53c2\u8003 [Node.js \u5b98\u65b9\u4fe1\u606f](https://nodejs.org/en/download/)
+
+\u5b89\u88c5\u5b8c\u6210\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u68c0\u6d4b\u662f\u5426\u5b89\u88c5\u6210\u529f\uff1a
+
+```bash
+$ node -v
+v6.3.1
+$ npm -v
+3.10.3
+```
+
+\u901a\u5e38\uff0c\u5b89\u88c5\u4e86 Node.js \u73af\u5883\uff0cnpm \u5305\u7ba1\u7406\u5de5\u5177\u4e5f\u968f\u4e4b\u5b89\u88c5\u4e86\u3002\u56e0\u6b64\uff0c\u76f4\u63a5\u4f7f\u7528 npm \u6765\u5b89\u88c5 weex-toolkit\u3002
+
+> npm \u662f\u4e00\u4e2a JavaScript \u5305\u7ba1\u7406\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u8ba9\u5f00\u53d1\u8005\u8f7b\u677e\u5171\u4eab\u548c\u91cd\u7528\u4ee3\u7801\u3002Weex \u5f88\u591a\u4f9d\u8d56\u6765\u81ea\u793e\u533a\uff0c\u540c\u6837\uff0cWeex \u4e5f\u5c06\u5f88\u591a\u5de5\u5177\u53d1\u5e03\u5230\u793e\u533a\u65b9\u4fbf\u5f00\u53d1\u8005\u4f7f\u7528\u3002
+
+**\u6ce8\u610f: ** weex-toolkit \u5728 1.0.1 \u4e4b\u540e\u624d\u652f\u6301\u521d\u59cb\u5316 Vue \u9879\u76ee\uff0c\u4f7f\u7528\u524d\u8bf7\u786e\u8ba4\u7248\u672c\u662f\u5426\u6b63\u786e\u3002
+
+```bash
+$ npm install -g weex-toolkit
+$ weex -v
+
+v1.0.3
+weex-builder : v0.2.4
+weex-previewer : v1.3.4
+```
+
+\u56fd\u5185\u5f00\u53d1\u8005\u53ef\u4ee5\u8003\u8651\u4f7f\u7528\u6dd8\u5b9d\u7684 npm \u955c\u50cf \u2014\u2014 [cnpm](https://npm.taobao.org/) \u5b89\u88c5 weex-toolkit
+
+```bash
+$ npm install -g cnpm
+$ cnpm install -g weex-toolkit
+```
+
+*\u63d0\u793a\uff1a*
+
+\u5982\u679c\u63d0\u793a\u6743\u9650\u9519\u8bef\uff08*permission error*\uff09\uff0c\u4f7f\u7528 `sudo` \u5173\u952e\u5b57\u8fdb\u884c\u5b89\u88c5
+
+```bash
+$ sudo cnpm install -g weex-toolkit
+```
+
+\u5b89\u88c5\u7ed3\u675f\u540e\u4f60\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528 `weex` \u547d\u4ee4\u9a8c\u8bc1\u662f\u5426\u5b89\u88c5\u6210\u529f\uff0c\u5b83\u4f1a\u663e\u793a `weex` \u547d\u4ee4\u884c\u5de5\u5177\u5404\u53c2\u6570\uff1a
+
+
+
+## \u7b2c\u4e8c\u6b65\uff1a\u521d\u59cb\u5316
+
+\u7136\u540e\u521d\u59cb\u5316 Weex \u9879\u76ee\uff1a
+
+```bash
+$ weex init awesome-project
+```
+
+\u6267\u884c\u5b8c\u547d\u4ee4\u540e\uff0c\u5728 `awesome-project` \u76ee\u5f55\u4e2d\u5c31\u521b\u5efa\u4e86\u4e00\u4e2a\u4f7f\u7528 Weex \u548c Vue \u7684\u6a21\u677f\u9879\u76ee\u3002
+
+## \u7b2c\u4e09\u6b65\uff1a\u5f00\u53d1
+
+\u4e4b\u540e\u6211\u4eec\u8fdb\u5165\u9879\u76ee\u6240\u5728\u8def\u5f84\uff0cweex-toolkit \u5df2\u7ecf\u4e3a\u6211\u4eec\u751f\u6210\u4e86\u6807\u51c6\u9879\u76ee\u7ed3\u6784\u3002
+
+\u5728 `package.json` \u4e2d\uff0c\u5df2\u7ecf\u914d\u7f6e\u597d\u4e86\u51e0\u4e2a\u5e38\u7528\u7684 npm script\uff0c\u5206\u522b\u662f\uff1a
+
+- `build`: \u6e90\u7801\u6253\u5305\uff0c\u751f\u6210 JS Bundle
+- `dev`: webpack watch \u6a21\u5f0f\uff0c\u65b9\u4fbf\u5f00\u53d1
+- `serve`: \u5f00\u542f\u9759\u6001\u670d\u52a1\u5668
+- `debug`: \u8c03\u8bd5\u6a21\u5f0f
+
+\u6211\u4eec\u5148\u901a\u8fc7 `npm install` \u5b89\u88c5\u9879\u76ee\u4f9d\u8d56\u3002\u4e4b\u540e\u8fd0\u884c `npm run dev` \u548c `npm run serve` \u5f00\u542fwatch \u6a21\u5f0f\u548c\u9759\u6001\u670d\u52a1\u5668\u3002
+
+\u7136\u540e\u6211\u4eec\u6253\u5f00\u6d4f\u89c8\u5668\uff0c\u8fdb\u5165 `http://localhost:8080/index.html` \u5373\u53ef\u770b\u5230 weex h5 \u9875\u9762\u3002
+
+\u521d\u59cb\u5316\u65f6\u5df2\u7ecf\u4e3a\u6211\u4eec\u521b\u5efa\u4e86\u57fa\u672c\u7684\u793a\u4f8b\uff0c\u6211\u4eec\u53ef\u4ee5\u5728 `src/foo.vue` \u4e2d\u67e5\u770b\u3002
+
+\u4ee3\u7801\u5982\u4e0b\u6240\u793a\uff1a
+
+```html
+<template>
+ <div class="wrapper">
+ <text class="weex">Hello Weex !</text>
+ <text class="vue">Hello Vue !</text>
+ </div>
+</template>
+
+<style scoped>
+ .wrapper {
+ flex-direction: column;
+ justify-content: center;
+ }
+ .weex {
+ font-size: 60px;
+ text-align: center;
+ color: #1B90F7;
+ }
+ .vue {
+ font-size: 60px;
+ text-align: center;
+ margin-top: 30px;
+ color: #41B883;
+ }
+</style>
+```
+
+\u5173\u4e8e Weex \u8bed\u6cd5\u90e8\u5206\uff0c\u4f60\u53ef\u4ee5\u76f4\u63a5\u53c2\u8003 [Vue Guide](https://vuejs.org/v2/guide/)\uff0c\u8fd9\u91cc\u4e0d\u518d\u91cd\u590d\u4ecb\u7ecd\u3002\u5982\u679c\u60a8\u60f3\u4e86\u89e3\u6709\u5173\u6280\u672f\u8be6\u60c5\u7684\u66f4\u591a\u4fe1\u606f\uff0c\u8bf7\u7ee7\u7eed\u9605\u8bfb\u4e0b\u4e00\u8282\u3002\u5e76\u4e14\u4e0d\u8981\u5fd8\u8bb0\u5728 dotWe \u5199\u4ee3\u7801\u5e76\u968f\u65f6\u9884\u89c8\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/tools/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/devtools.md b/doc/source/cn/guide/tools/devtools.md
new file mode 100644
index 0000000..f1c4dbc
--- /dev/null
+++ b/doc/source/cn/guide/tools/devtools.md
@@ -0,0 +1,111 @@
+---
+title: \u4f7f\u7528 Devtools
+type: guide
+order: 4.1
+version: 2.1
+has_chapter_content: true
+---
+
+# Devtools
+
+**weex devtools** \u662f\u4e13\u95e8\u4e3a Weex \u5b9a\u5236\u7684\u4e00\u6b3e\u5b9e\u73b0\u4e86 [**Chrome Debugging Protocol**](https://developer.chrome.com/devtools/docs/debugger-protocol) \u7684 inspect/debug \u5de5\u5177\uff0c\u80fd\u591f\u5e2e\u52a9\u4f60\u5feb\u901f\u67e5\u770b app \u8fd0\u884c\u72b6\u6001\u548c\u8c03\u8bd5 weex \u4e2d\u7684 Javascript \u4ee3\u7801\uff0c\u5f53\u524d\u652f\u6301 **iOS** \u548c **Android** \u4e24\u4e2a\u5e73\u53f0\u3002
+
+1. \u652f\u6301 Android \u548c iOS \u8c03\u8bd5
+2. \u652f\u6301\u771f\u673a\u548c\u6a21\u62df\u5668
+3. \u53ef\u4ee5\u68c0\u67e5 native Elements, vdom, network, Console, Resource
+4. \u53ef\u4ee5\u8c03\u8bd5 js/wx/Rx \u7b49\u524d\u7aef\u6e90\u7801\u6587\u4ef6
+5. \u652f\u6301\u540c\u65f6\u5728\u524d\u7aef\u6587\u4ef6\u548c native (Android\uff0fiOS) \u6587\u4ef6\u4e0a\u65ad\u70b9\u8c03\u8bd5
+6. \u652f\u6301\u8fdc\u7a0b\u8c03\u8bd5\uff0c\u4e0d\u9700\u8981\u771f\u673a USB \u8fde\u63a5\u7535\u8111
+7. \u652f\u6301 screencast \u548c select element \u529f\u80fd
+8. \u652f\u6301\u540c\u65f6\u8c03\u8bd5\u591a\u4e2a\u5e94\u7528\u548c\u5ba2\u6237\u7aef
+
+## \u5b89\u88c5
+
+```
+$ npm install -g weex-toolkit
+```
+
+## \u7528\u6cd5
+
+ weex debug [options] [we_file|bundles_dir]
+
+ \u9009\u9879:
+
+```
+-h, --help \u663e\u793a\u5e2e\u52a9
+-V, --verbose \u663e\u793a debug \u670d\u52a1\u5668\u8fd0\u884c\u65f6\u7684\u5404\u79cd log
+-v, --version \u663e\u793a\u7248\u672c
+-p, --port [port] \u8bbe\u7f6e debug \u670d\u52a1\u5668\u7aef\u53e3\u53f7 \u9ed8\u8ba4\u4e3a 8088
+-e, --entry [entry] debug \u4e00\u4e2a\u76ee\u5f55\u65f6,\u8fd9\u4e2a\u53c2\u6570\u6307\u5b9a\u6574\u4e2a\u76ee\u5f55\u7684\u5165\u53e3 bundle \u6587\u4ef6,\u8fd9\u4e2a bundle \u6587\u4ef6\u7684\u5730\u5740\u4f1a\u663e\u793a\u5728debug\u4e3b\u9875\u4e0a(\u4f5c\u4e3a\u4e8c\u7ef4\u7801)
+-m, --mode [mode] \u8bbe\u7f6e\u6784\u5efawe\u6587\u4ef6\u7684\u65b9\u5f0f, transformer \u6700\u57fa\u7840\u7684\u98ce\u683c\u9002\u5408\u5355\u6587\u4ef6, loader:wepack \u98ce\u683c \u9002\u5408\u6a21\u5757\u5316\u7684\u591a\u6587\u4ef6\u3002\u9ed8\u8ba4\u4e3a transformer
+```
+
+#### \u5f00\u542f\u8c03\u8bd5
+
+```
+$ weex debug
+```
+
+\u5355\u7eaf\u542f\u52a8\u4e00\u4e2a\u8c03\u8bd5\u670d\u52a1\u5668,\u5e76\u540c\u65f6\u5524\u8d77chrome\u6d4f\u89c8\u5668\u6253\u5f00`\u8c03\u8bd5\u4e3b\u9875`.
+\u8fd9\u4e2a`\u8c03\u8bd5\u4e3b\u9875`\u4e0a\u4f1a\u6709\u4e00\u4e2a\u4e8c\u7ef4\u7801,\u4f7f\u7528Playground App\u626b\u8fd9\u4e2a\u4e8c\u7ef4\u7801\u53ef\u4ee5\u5f00\u542fPlayground\u8c03\u8bd5.
+\u5f00\u542f\u8c03\u8bd5\u540e,\u8bbe\u5907\u5217\u8868\u4e2d\u4f1a\u51fa\u73b0\u60a8\u7684\u8bbe\u5907,\u6839\u636e\u63d0\u793a\u8fdb\u884c\u540e\u7eed\u7684\u8c03\u8bd5\u64cd\u4f5c
+#### \u8c03\u8bd5 we\u6587\u4ef6
+
+```
+$weex debug your_weex.we
+```
+
+\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5c06your_weex.we\u7f16\u8bd1\u6210bundlejs\u6587\u4ef6 \u90e8\u7f72\u5230debug\u670d\u52a1\u5668
+\u5e76\u542f\u52a8debug\u670d\u52a1\u5668\u5982\u4e0a\u8ff0\u547d\u4ee4\u90a3\u6837.\u6253\u5f00\u7684`\u8c03\u8bd5\u4e3b\u9875`\u4f1a\u591a\u663e\u793a\u4e00\u4e2a\u4e8c\u7ef4\u7801,\u4f7f\u7528playground app
+\u626b\u8fd9\u4e2a\u7801\u53ef\u4ee5\u52a0\u8f7dyour_weex.we.(\u6ce8\u610f\u8981\u5148\u626b\u63cf\u5f00\u542f\u8c03\u8bd5\u7684\u90a3\u4e2a\u7801)
+\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u81ea\u52a8\u68c0\u6d4byour_weex.we\u6587\u4ef6\u53d8\u52a8,\u5982\u679c\u53d1\u73b0\u5185\u5bb9\u88ab\u4fee\u6539\u5219\u7acb\u5373\u91cd\u65b0\u7f16\u8bd1\u90e8\u7f72,\u5e76\u5237\u65b0debugger\u9875\u9762
+.
+#### \u8c03\u8bd5\u6574\u4e2abundle/we\u6587\u4ef6\u5939
+
+```
+$weex debug your/we/path -e index.we
+```
+
+\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u7f16\u8bd1\u4f60\u6307\u5b9a\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u7684we\u6587\u4ef6,\u5e76\u628a\u7f16\u8bd1\u597d\u7684bundlejs\u90e8\u7f72\u5230debug\u670d\u52a1\u5668,\u4ed6\u4eec\u7684\u5730\u5740\u4f1a\u6620\u5c04\u5230 http://lcoalhost:8088/weex/ \u4e0b
+\u6bd4\u5982 your/we/path/`index.we` \u53ef\u4ee5\u901a\u8fc7http://lcoalhost:8088/weex/index.js\u8bbf\u95ee
+your/we/path/`demo/test.we` \u53ef\u4ee5\u901a\u8fc7http://lcoalhost:8088/weex/demo/index.js
+
+-e\u53c2\u6570\u53ef\u4ee5\u6307\u5b9a\u4e00\u4e2a\u5165\u53e3\u7684we\u6587\u4ef6,\u8fd9\u4e2a\u6587\u4ef6\u7684\u5730\u5740\u4f1a\u663e\u793a\u5728`\u8c03\u8bd5\u4e3b\u9875`\u4e0a(\u4f5c\u4e3a\u4e8c\u7ef4\u7801)
+## \u7279\u6027
+### \u8fde\u63a5\u8bbe\u5907
+
+
+### Inspector
+
+ Inspector \u80fd\u591f\u7528\u6765\u67e5\u770b `Element` \ `NetWork` \ `Console log` \ `ScreenCast` \ `BoxModel` \ `Native View` \u7b49\u3002
+
+
+#### Element
+
+
+#### NetWork
+##### \u67e5\u770b\u7f51\u7edc\u8bf7\u6c42\u7684\u603b\u8017\u65f6\u548c\u5ef6\u65f6
+
+
+##### \u67e5\u770b\u7f51\u7edc\u8bf7\u6c42\u7684header\u548cresponse
+
+
+#### \u63a7\u5236\u53f0
+
+
+#### \u8d44\u6e90
+
+
+### Debugger
+
+ \u8c03\u8bd5\u5668\u7528\u6765\u8c03\u8bd5weex\u4e2d\u7684js\u4ee3\u7801\uff0c\u80fd\u591f\u8bbe\u7f6e\u65ad\u70b9\u3001\u67e5\u770b\u8c03\u7528\u6808\u3002
+
+
+##### Breakpoint and CallStack
+
+
+#### \u96c6\u6210devtools
+- Android
+ - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
+- IOS
+ - \u8bf7\u53c2\u8003\u6587\u6863 [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), \u5176\u4e2d\u6709\u8be6\u7ec6\u8bf4\u660e\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/index.md b/doc/source/cn/guide/tools/index.md
new file mode 100644
index 0000000..a9c5a26
--- /dev/null
+++ b/doc/source/cn/guide/tools/index.md
@@ -0,0 +1,11 @@
+---
+title: \u5468\u8fb9\u5de5\u5177
+type: guide
+order: 4
+version: 2.1
+---
+
+# \u5468\u8fb9\u5de5\u5177
+
+- [Devtools](./devtools.html)
+- [Weexpack](./weexpack.html)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/guide/tools/weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/tools/weexpack.md b/doc/source/cn/guide/tools/weexpack.md
new file mode 100644
index 0000000..ac64dd7
--- /dev/null
+++ b/doc/source/cn/guide/tools/weexpack.md
@@ -0,0 +1,388 @@
+---
+title: \u4f7f\u7528 Weexpack
+type: guide
+order: 4.2
+version: 2.1
+---
+
+# \u4f7f\u7528 Weexpack
+
+## weexpack \u4ecb\u7ecd
+
+weexpack \u662f weex \u65b0\u4e00\u4ee3\u7684\u5de5\u7a0b\u5f00\u53d1\u5957\u4ef6\uff0c\u662f\u57fa\u4e8e weex \u5feb\u901f\u642d\u5efa\u5e94\u7528\u539f\u578b\u7684\u5229\u5668\u3002\u5b83\u80fd\u591f\u5e2e\u52a9\u5f00\u53d1\u8005\u901a\u8fc7\u547d\u4ee4\u884c\u521b\u5efa Weex \u5de5\u7a0b\uff0c\u6dfb\u52a0\u76f8\u5e94\u5e73\u53f0\u7684 Weex app \u6a21\u7248\uff0c\u5e76\u57fa\u4e8e\u6a21\u7248\u4ece\u672c\u5730\u3001GitHub \u6216\u8005 Weex \u5e94\u7528\u5e02\u573a\u5b89\u88c5\u63d2\u4ef6\uff0c\u5feb\u901f\u6253\u5305 Weex \u5e94\u7528\u5e76\u5b89\u88c5\u5230\u624b\u673a\u8fd0\u884c\uff0c\u5bf9\u4e8e\u5177\u6709\u5206\u4eab\u7cbe\u795e\u7684\u5f00\u53d1\u8005\u800c\u8a00\u8fd8\u80fd\u591f\u521b\u5efa Weex \u63d2\u4ef6\u6a21\u7248\u5e76\u53d1\u5e03\u63d2\u4ef6\u5230 Weex \u5e94\u7528\u5e02\u573a\u3002
+
+**\u6ce8\u610f\uff1a** weexpack \u76ee\u524d\u6682\u4e0d\u652f\u6301\u642d\u5efa Vue 2.0 \u7248\u672c\u7684 Weex\u3002
+
+weexpack \u6240\u63d0\u4f9b\u7684\u547d\u4ee4\u5927\u81f4\u53ef\u5206\u4e3a\u4e09\u7ec4\uff0c\u5206\u522b\u662f\uff1a
+
+* \u6253\u5305\u547d\u4ee4
+ * **weexpack create** \u2014 \u521b\u5efa Weex \u5de5\u7a0b\u9879\u76ee\u3002
+ * **weexpack platform add/remove** \u2014 \u5b89\u88c5\uff0f\u79fb\u9664 Weex \u5e94\u7528\u6a21\u7248\uff0c\u9ed8\u8ba4\u6a21\u7248\u652f\u6301 Weex bundle \u8c03\u8bd5\u548c\u63d2\u4ef6\u673a\u5236\u3002
+ * **weexpack platform list** \u2014 \u67e5\u770b\u5df2\u5b89\u88c5\u7684\u5e73\u53f0\u6a21\u7248\u53ca\u7248\u672c\u3002
+ * **weexpack platform run** - \u6253\u5305\u5e94\u7528\u5e76\u5b89\u88c5\u5230\u8bbe\u5907\u8fd0\u884c\u3002
+
+
+* \u63d2\u4ef6\u4f7f\u7528\u8005\u547d\u4ee4
+ * **weexpack plugin add/remove** \u2014 \u5b89\u88c5\uff0f\u79fb\u9664 Weex \u63d2\u4ef6\uff0c\u652f\u6301\u4ece\u672c\u5730\u3001GitHub \u6216\u8005 Weex \u5e94\u7528\u5e02\u573a\u5b89\u88c5\u63d2\u4ef6\u3002
+
+ * **weexpack plugin list** \u2014 \u67e5\u770b\u5df2\u5b89\u88c5\u7684\u63d2\u4ef6\u53ca\u7248\u672c\u3002
+
+
+* \u63d2\u4ef6\u5f00\u53d1\u8005\u547d\u4ee4
+
+ * **weexpack plugin create** - \u751f\u6210 Weex \u63d2\u4ef6\u6a21\u7248\uff0c\u4e3b\u8981\u662f\u914d\u7f6e\u6587\u4ef6\u548c\u5fc5\u9700\u7684\u76ee\u5f55\u3002
+ * **weexpack plugin publish** - \u53d1\u5e03\u63d2\u4ef6\u5230 Weex \u63d2\u4ef6\u5e02\u573a\u3002
+
+
+## \u5b89\u88c5
+
+### \u73af\u5883\u8981\u6c42
+
+ - \u76ee\u524d\u652f\u6301 Mac\u3001windows\u3001linux \u5e73\u53f0 ( windows \u4e0b\u4ec5\u80fd\u6253\u5305 android )\u3002
+ - \u914d\u7f6e [Node.js][1] \u73af\u5883\uff0c\u5e76\u4e14\u5b89\u88c5 [npm][2] \u5305\u7ba1\u7406\u5668 (`\u9700\u8981 node6.0+`)\u3002
+ - \u5982\u679c\u8981\u652f\u6301 iOS \u5e73\u53f0\u5219\u9700\u8981\u914d\u7f6e iOS \u5f00\u53d1\u73af\u5883\uff1a
+ - \u5b89\u88c5 [Xcode IDE][3] \uff0c\u542f\u52a8\u4e00\u6b21 Xcode \uff0c\u4f7f Xcode \u81ea\u52a8\u5b89\u88c5\u5f00\u53d1\u8005\u5de5\u5177\u548c\u786e\u8ba4\u4f7f\u7528\u534f\u8bae\u3002
+ - \u5b89\u88c5 cocoaPods\u3002
+ - \u5982\u679c\u8981\u652f\u6301 Android \u5e73\u53f0\u5219\u9700\u8981\u914d\u7f6e Android \u5f00\u53d1\u73af\u5883\uff1a
+ - \u5b89\u88c5 [Android Studio][4]\uff08\u63a8\u8350\uff09\u6216\u8005 [Android SDK][7]\u3002\u6253\u5f00 [AVD Manager][5] \uff0c\u65b0\u5efa Android \u6a21\u62df\u5668\u5e76\u542f\u52a8\uff08\u5982\u679c\u6709\u5b89\u88c5 [Docker][6] \uff0c\u8bf7\u5173\u95ed Docker Server \uff09\u3002
+ - \u4fdd\u8bc1 Android build-tool \u7684\u7248\u672c\u4e3a 23.0.2\u3002
+
+#### \u5b89\u88c5\u547d\u4ee4
+
+\u9996\u5148\uff0c\u5168\u5c40\u5b89\u88c5 weex-pack \u547d\u4ee4\uff1a
+
+```bash
+$ npm install -g weexpack
+```
+
+\u6216\u8005 \u5728 clone \u7684 weexpack \u6839\u76ee\u5f55\u4e0b\u6267\u884c
+
+```bash
+$ npm install
+```
+
+## \u6253\u5305\u53ca\u63d2\u4ef6\u4f7f\u7528
+
+\u6253\u5305\u4e3b\u8981\u8fc7\u7a0b\u5982\u4e0b\u56fe\u6240\u793a\uff0c\u5176\u4e2d\u63d2\u4ef6\u64cd\u4f5c\u662f\u6253\u5305\u8fc7\u7a0b\u7684\u53ef\u9009\u9879\uff0c\u4e0d\u662f\u5fc5\u987b\u7684\u3002
+
+
+
+### \u8be6\u7ec6\u6b65\u9aa4
+
+#### 1. \u521b\u5efa weexpack \u5de5\u7a0b
+
+```bash
+$ weexpack create appName
+```
+
+\u751f\u6210\u5de5\u7a0b\u7684\u76ee\u5f55\u5982\u4e0b\uff1a
+
+```
+WeexProject
+\u251c\u2500\u2500 README.md
+\u251c\u2500\u2500 android.config.json
+\u251c\u2500\u2500 config.xml
+\u251c\u2500\u2500 hooks
+\u2502�� \u2514\u2500\u2500 README.md
+\u251c\u2500\u2500 ios.config.json
+\u251c\u2500\u2500 package.json
+\u251c\u2500\u2500 platforms // \u5e73\u53f0\u6a21\u7248\u76ee\u5f55
+\u251c\u2500\u2500 plugins // \u63d2\u4ef6\u4e0b\u8f7d\u76ee\u5f55
+\u2502�� \u2514\u2500\u2500 README.md
+\u251c\u2500\u2500 src // \u4e1a\u52a1\u4ee3\u7801\uff08we\u6587\u4ef6\uff09\u76ee\u5f55
+\u2502�� \u2514\u2500\u2500 index.we
+\u251c\u2500\u2500 start
+\u251c\u2500\u2500 start.bat
+\u251c\u2500\u2500 tools
+\u2502�� \u2514\u2500\u2500 webpack.config.plugin.js
+\u251c\u2500\u2500 web
+\u2502�� \u251c\u2500\u2500 index.html
+\u2502�� \u251c\u2500\u2500 index.js
+\u2502�� \u2514\u2500\u2500 js
+\u2502�� \u2514\u2500\u2500 init.js
+\u2514\u2500\u2500 webpack.config.js
+```
+
+\u901a\u8fc7 create \u547d\u4ee4\u521b\u5efa\u7684\u5de5\u7a0b\u9ed8\u8ba4\u4e0d\u5305\u542b iOS \u548c Android \u5de5\u7a0b\u6a21\u7248\uff0c\u521b\u5efa\u5b8c\u6210\u4e4b\u540e\u5c31\u53ef\u4ee5\u5207\u6362\u5230 appName \u76ee\u5f55\u4e0b\u5e76\u5b89\u88c5\u4f9d\u8d56\u3002
+
+```bash
+$ cd appName && npm install
+```
+
+#### 2. \u5b89\u88c5 Weex \u5e94\u7528\u6a21\u7248
+
+\u6dfb\u52a0\u5e94\u7528\u6a21\u7248\uff0c\u5b98\u65b9\u63d0\u4f9b\u7684\u6a21\u7248\u9ed8\u8ba4\u652f\u6301 Weex bundle \u8c03\u8bd5\u548c\u63d2\u4ef6\u673a\u5236\uff0c\u6ce8\u610f\u6a21\u7248\u540d\u79f0\u5747\u4e3a\u5c0f\u5199\uff0c\u6a21\u7248\u88ab\u5b89\u88c5\u5230 platforms \u76ee\u5f55\u4e0b\u3002
+
+* android \u6a21\u7248
+
+ ```bash
+ $ weexpack platform add android
+ ```
+
+* iOS \u6a21\u7248
+
+ ```bash
+ $ weexpack platform add ios
+ ```
+
+android \u5e73\u53f0\uff0c\u5b89\u88c5\u540e platforms \u76ee\u5f55\u5982\u4e0b
+
+```
+platforms
+\u2514\u2500\u2500 android
+ \u251c\u2500\u2500 LICENSE
+ \u251c\u2500\u2500 NOTICE
+ \u251c\u2500\u2500 README.md
+ \u251c\u2500\u2500 app
+ \u2502�� \u251c\u2500\u2500 build
+ \u2502�� \u251c\u2500\u2500 build.gradle
+ \u2502�� \u251c\u2500\u2500 proguard-rules.pro
+ \u2502�� \u2514\u2500\u2500 src
+ \u251c\u2500\u2500 appframework
+ \u2502�� \u251c\u2500\u2500 build
+ \u2502�� \u251c\u2500\u2500 build.gradle
+ \u2502�� \u251c\u2500\u2500 proguard-rules.pro
+ \u2502�� \u2514\u2500\u2500 src
+ \u251c\u2500\u2500 build
+ \u2502�� \u2514\u2500\u2500 generated
+ \u251c\u2500\u2500 build.gradle
+ \u251c\u2500\u2500 codeStyleSettings.xml
+ \u251c\u2500\u2500 gradle
+ \u2502�� \u2514\u2500\u2500 wrapper
+ \u251c\u2500\u2500 gradle.properties
+ \u251c\u2500\u2500 gradlew
+ \u251c\u2500\u2500 gradlew.bat
+ \u251c\u2500\u2500 settings.gradle
+ \u2514\u2500\u2500 weexplugin
+ \u251c\u2500\u2500 build.gradle
+ \u251c\u2500\u2500 proguard-rules.pro
+ \u2514\u2500\u2500 src
+
+```
+
+ios\u5e73\u53f0\uff0c\u5b89\u88c5\u540e platforms \u76ee\u5f55\u5982\u4e0b
+
+```
+platforms
+�� \u2514\u2500\u2500 ios
+�� \u251c\u2500\u2500 LICENSE
+�� \u251c\u2500\u2500 Podfile
+�� \u251c\u2500\u2500 README.md
+�� \u251c\u2500\u2500 WeexDemo
+�� \u2502�� \u251c\u2500\u2500 AppDelegate.h
+�� \u2502�� \u251c\u2500\u2500 AppDelegate.m
+�� \u2502�� \u251c\u2500\u2500 Assets.xcassets
+�� \u2502�� \u251c\u2500\u2500 DemoDefine.h
+�� \u2502�� \u251c\u2500\u2500 Images.xcassets
+�� \u2502�� \u251c\u2500\u2500 WeexConfig
+�� \u2502�� \u251c\u2500\u2500 WeexDemo-Info.plist
+�� \u2502�� \u251c\u2500\u2500 WeexScanner
+�� \u2502�� \u251c\u2500\u2500 config.xml
+�� \u2502�� \u251c\u2500\u2500 main.m
+�� \u2502�� \u2514\u2500\u2500 weex-icon.png
+�� \u251c\u2500\u2500 WeexDemo.xcodeproj
+�� \u2502�� \u251c\u2500\u2500 project.pbxproj
+�� \u2502�� \u251c\u2500\u2500 project.xcworkspace
+�� \u2502�� \u251c\u2500\u2500 xcshareddata
+�� \u2502�� \u2514\u2500\u2500 xcuserdata
+�� \u251c\u2500\u2500 WeexDemo.xcworkspace
+�� \u2502�� \u251c\u2500\u2500 contents.xcworkspacedata
+�� \u2502�� \u251c\u2500\u2500 xcshareddata
+�� \u2502�� \u2514\u2500\u2500 xcuserdata
+�� \u251c\u2500\u2500 WeexDemoTests
+�� \u2502�� \u251c\u2500\u2500 Info.plist
+�� \u2502�� \u2514\u2500\u2500 WeexDemoTests.m
+�� \u251c\u2500\u2500 WeexUITestDemo-Info.plist
+�� \u251c\u2500\u2500 WeexUITestDemoUITests
+�� \u2502�� \u251c\u2500\u2500 Info.plist
+�� \u2502�� \u2514\u2500\u2500 WeexUITestDemoUITests.m
+�� \u251c\u2500\u2500 Weexplugin
+�� \u2502�� \u251c\u2500\u2500 Podfile
+�� \u2502�� \u251c\u2500\u2500 Weexplugin
+�� \u2502�� \u251c\u2500\u2500 Weexplugin.podspec
+�� \u2502�� \u251c\u2500\u2500 Weexplugin.xcodeproj
+�� \u2502�� \u2514\u2500\u2500 WeexpluginTests
+�� \u251c\u2500\u2500 bundlejs
+
+ ```
+
+\u5bf9\u4e8e\u5df2\u5b89\u88c5\u7684\u6a21\u7248\u53ef\u4ee5\u4f7f\u7528 weexpack platform list \u547d\u4ee4\u67e5\u770b\u3002
+
+* \u67e5\u770b\u5df2\u5b89\u88c5\u6a21\u7248
+
+ ```bash
+ $ weexpack platform list
+ ```
+
+ \u793a\u4f8b\u7ed3\u679c\uff1a
+
+ ```
+ Installed platforms:
+ android
+ Available platforms:
+ android ^6.2.1
+ ```
+
+\u5982\u679c\u60f3\u8981\u5220\u9664\u67d0\u4e2a\u4e0d\u9700\u8981\u7684\u5e73\u53f0\u53ef\u4ee5\u4f7f\u7528 weexpack platform remove \u79fb\u9664\uff0c\u6bd4\u5982 Windows \u5e73\u53f0\u7528\u6237\u662f\u4e0d\u9700\u8981 iOS \u6a21\u7248\u7684\uff0c\u53ef\u7528\u5982\u4e0b\u547d\u4ee4\u79fb\u9664\u3002
+
+
+* \u79fb\u9664\u76f8\u5e94\u5e73\u53f0\u6a21\u7248
+
+ ```bash
+ $ weexpack platform remove ios
+ ```
+
+#### 3. \u5b89\u88c5 Weex \u63d2\u4ef6\uff08\u53ef\u9009\u9879\uff09
+
+\u6dfb\u52a0\u60f3\u8981\u4f7f\u7528\u7684\u63d2\u4ef6\uff0c\u652f\u6301\u4ece\u672c\u5730\u6216\u8005 Weex \u5e94\u7528\u5e02\u573a\u5b89\u88c5\u63d2\u4ef6\u3002
+
+* \u4ece\u672c\u5730\u6dfb\u52a0\u63d2\u4ef6\uff0c\u5728\u5f00\u53d1\u63d2\u4ef6\u65f6\u4f1a\u7ecf\u5e38\u7528\u5230
+
+ ```bash
+ $ weexpack plugin add path/to/plugin
+ ```
+
+* \u4ece\u63d2\u4ef6\u5e02\u573a\u6dfb\u52a0\u63d2\u4ef6\uff0c\u4f8b\u5982 weex-chart\u3002
+
+ ```bash
+ $ weexpack plugin add weex-chart
+ ```
+
+\u6a21\u7248\u7684 weexplugin \u662f\u63d2\u4ef6\u5b89\u88c5\u7684\u76ee\u6807\u5de5\u7a0b\u3002\u4ee5 Android \u4e3a\u4f8b\uff0c\u5176\u76ee\u5f55\u5982\u4e0b\uff1a
+
+```
+weexplugin
+\u251c\u2500\u2500 build.gradle // \u63d2\u4ef6\u7f16\u8bd1\u811a\u672c\uff0c\u5de5\u5177\u81ea\u52a8\u7ef4\u62a4
+\u251c\u2500\u2500 libs
+\u251c\u2500\u2500 proguard-rules.pro
+\u251c\u2500\u2500 src
+\u2502 \u2514\u2500\u2500 main
+\u2502 \u251c\u2500\u2500 AndroidManifest.xml // \u63d2\u4ef6android manifest\u914d\u7f6e\u6587\u4ef6
+\u2502 \u251c\u2500\u2500 java
+\u2502 \u2502 \u251c\u2500\u2500 // \u63d2\u4ef6src\u5b89\u88c5\u76ee\u5f55
+\u2502 \u2502 \u2514\u2500\u2500 com
+\u2502 \u2502 \u2514\u2500\u2500 alibaba
+\u2502 \u2502 \u2514\u2500\u2500 weex
+\u2502 \u2502 \u2514\u2500\u2500 plugin
+\u2502 \u2502 \u251c\u2500\u2500 ConfigXmlParser.java // \u914d\u7f6e\u6587\u4ef6\u89e3\u6790\u5668
+\u2502 \u2502 \u251c\u2500\u2500 PluginConfig.java // \u5916\u90e8\u63a5\u53e3
+\u2502 \u2502 \u251c\u2500\u2500 PluginEntry.java // \u63d2\u4ef6\u63cf\u8ff0
+\u2502 \u2502 \u2514\u2500\u2500 PluginManager.java // \u63d2\u4ef6\u7ba1\u7406\u5668
+\u2502 \u2514\u2500\u2500 res // \u63d2\u4ef6\u8d44\u6e90\u5b89\u88c5\u76ee\u5f55
+\u2502 \u251c\u2500\u2500 drawable
+\u2502 \u251c\u2500\u2500 values
+\u2502 \u2502 \u2514\u2500\u2500 strings.xml
+\u2502 \u2514\u2500\u2500 xml
+\u2502 \u2514\u2500\u2500 config.xml // \u63d2\u4ef6\u914d\u7f6e\u6587\u4ef6\uff0cPluginManager \u89e3\u6790\u914d\u7f6e\u6587\u4ef6\u52a0\u8f7d\u63d2\u4ef6
+```
+
+\u5bf9\u4e8e\u5df2\u5b89\u88c5\u7684\u63d2\u4ef6\u53ef\u4ee5\u4f7f\u7528 weexpack plugin list \u547d\u4ee4\u67e5\u770b\u3002
+
+* \u67e5\u770b\u5df2\u5b89\u88c5\u63d2\u4ef6
+
+ ```bash
+ $ weexpack plugin list
+ ```
+
+\u5982\u679c\u60f3\u8981\u5220\u9664\u67d0\u4e2a\u4e0d\u9700\u8981\u7684\u63d2\u4ef6\u53ef\u4ee5\u4f7f\u7528 weexpack plugin remove \u79fb\u9664\uff0c\u6bd4\u5982 weex-chart
+
+* \u79fb\u9664\u63d2\u4ef6\uff0c\u4f8b\u5982 weex-chart
+
+ ```bash
+ $ weexpack plugin remove weex-chart
+ ```
+
+
+
+#### 4. \u6253\u5305\u5e94\u7528\u5e76\u5b89\u88c5\u8fd0\u884c
+
+\u5b8c\u6210\u4ee5\u4e0a\u6b65\u9aa4\u5e76 Weex \u4ee3\u7801\u653e\u5728 src \u76ee\u5f55\u4e0b\uff0c\u5c31\u53ef\u4ee5\u6253\u5305\u8fd0\u884c\u4e86\uff0c\u6253\u5305\u8fc7\u7a0b\u4e2d\u53ef\u80fd\u8981\u4e0b\u8f7d\u4f9d\u8d56\u548c\u7f16\u8bd1\u5de5\u5177\uff0c\u8fd9\u4f1a\u662f\u4e2a\u8f83\u4e3a\u8017\u65f6\u7684\u8fc7\u7a0b\uff0c\u5b89\u88c5\u8fd0\u884c\u9700\u8981\u6253\u5f00\u6a21\u62df\u5668\u6216\u8005\u8fde\u63a5\u8bbe\u5907\u3002
+
+* \u6253\u5305\u8fd0\u884c android \u5e94\u7528
+
+ ```bash
+ $ weexpack run android
+ ```
+
+ \u4f60\u53ef\u4ee5\u66f4\u6539\u9879\u76ee\u76ee\u5f55\u4e0b\u7684 android.config.json
+ * AppName: \u5e94\u7528\u540d
+ * AppId: application_id \u5305\u540d
+ * SplashText: \u6b22\u8fce\u9875\u4e0a\u9762\u7684\u6587\u5b57
+ * WeexBundle: \u6307\u5b9a\u7684 Weex bundle \u6587\u4ef6\uff08\u652f\u6301\u6587\u4ef6\u540d\u548c url \u7684\u5f62\u5f0f\uff09
+
+ \u6587\u4ef6\u540d\u5219\u4ee5\u672c\u5730\u6587\u4ef6\u7684\u65b9\u5f0f\u52a0\u8f7d bundle, url \u5219\u4ee5\u8fdc\u7a0b\u7684\u65b9\u5f0f\u52a0\u8f7d bundle
+ \u5982\u679c\u4ee5\u672c\u5730\u65b9\u5f0f\u6307\u5b9a bundle, `.we` \u6587\u4ef6\u8bf7\u653e\u5230 src \u76ee\u5f55\u3002
+
+* \u6253\u5305\u8fd0\u884c iOS \u5e94\u7528
+ * \u6a21\u62df\u5668\u8fd0\u884c
+
+ ```bash
+ $ weexpack run ios
+ ```
+
+ * \u6784\u5efa ipa \u5305
+
+ ```bash
+ $ weexpack build ios
+ ```
+
+ \u6784\u5efa\u5305\u7684\u8fc7\u7a0b\u4e2d\uff0c\u5c06\u4f1a\u63d0\u793a\u8ba9\u60a8\u8f93\u5165 `CodeSign\uff08\u8bc1\u4e66\uff09`\uff0c`Profile(provisioning profile)`,`AppId`\uff0c\u53ea\u6709\u8f93\u5165\u771f\u5b9e\u7684\u8fd9\u4e9b\u4fe1\u606f\u624d\u80fd\u6210\u529f\u6253\u5305\u3002
+ \u5176\u4f59\u5982 AppName , \u548c\u5165\u53e3 Weex bundle \u6587\u4ef6\u53ef\u4ee5\u7f16\u8f91\u9879\u76ee\u76ee\u5f55\u4e0b\u7684 ios.config.json \u914d\u7f6e\u3002
+ \u6253\u5b8c\u5305\u6210\u529f\u4e4b\u540e\uff0c\u53ef\u4ee5\u5728 `/playground/build/ipa_build/` \u76ee\u5f55\u4e0b\u83b7\u53d6 ipa \u6587\u4ef6
+
+ **\u6ce8\uff1a\u8bc1\u4e66\u9700\u8981\u9884\u5148\u5b89\u88c5\u5230 keychain \u4e2d\uff0c\u5728 keychain \u4e2d\u70b9\u51fb\u53f3\u952e\u83b7\u53d6\u8bc1\u4e66 `id`\uff08\u8bc1\u4e66\u540d\u79f0\uff09\uff0c`provisioning profile` \u6587\u4ef6\uff08*mobileprovision\uff09\u9700\u8981\u83b7\u53d6 UUID\uff0c\u8fdb\u5165[\u76ee\u5f55](https://github.com/weexteam/weex-pack/tree/dev/generator/platforms/templates) \u53ef\u4ee5\u770b\u5230 `mobileprovision_UUID.sh` \u6587\u4ef6\uff0c\u6b64\u6587\u4ef6\u53ef\u4ee5\u83b7\u53d6\u5230 UUID**
+
+ `mobileprovision_UUID.sh` \u7528\u6cd5\u5982\u4e0b\uff1a
+
+ ```bash
+ $ ./mobileprovision_UUID.sh � \*mobileprovision
+ ```
+
+ \u53c2\u6570\uff08\*mobileprovision\uff09\u4e3a `provisioning profile` \u6587\u4ef6\u8def\u5f84
+
+* \u6253\u5305 Web \u5e73\u53f0\uff1a
+
+ ```bash
+ $ weexpack build web
+ ```
+
+ \u8fd9\u6837\u4f60\u53ef\u4ee5\u628a\u6253\u5305\u540e\u7684\u8d44\u6e90\u4e0a\u4f20\u5230 CDN \u670d\u52a1\u5668\uff0c\u7136\u540e\u4e0a\u7ebf\u4f60\u7684 Web \u9879\u76ee\u3002
+
+* \u5728 Web \u5e73\u53f0\u8fd0\u884c\uff1a
+
+ ```bash
+ $ weexpack run web
+ ```
+
+#### 5.\u73b0\u6709\u5e94\u7528\u96c6\u6210\u63d2\u4ef6 \u2014\u2014 \u7ec4\u4ef6\u5bb9\u5668
+
+* \u7ec4\u4ef6\u5bb9\u5668\u4f5c\u7528
+
+ �\u63d2\u4ef6\u53ef\u4ee5\u901a\u8fc7\u7ec4\u4ef6\u5bb9\u5668\u7684\u65b9\u5f0f\u96c6\u6210\u5230\u5ba2\u6237\u7aef\uff08app\uff09\uff0c\u7ec4\u4ef6\u5bb9\u5668\u53ef\u4ee5\u65b9\u4fbf\u751f\u6210\u4e8c\u8fdb\u5236\u5305\uff0c\u73b0\u6709\u5e94\u7528\u53ef\u4ee5\u901a\u8fc7\u5404\u79cd\u5f62\u5f0f\u628a\u4e8c\u8fdb\u5236\u5305\u6216\u6e90\u7801\u96c6\u6210\u8fdb\u53bb\uff0c\u6bd4\u5982 iOS \u53ef\u4ee5\u901a\u8fc7 pod \u4f9d\u8d56 � \u7684\u5f62\u5f0f\u7b49\u3002\u5728 weexpack \u521b\u5efa\u7684\u6839\u76ee\u5f55\u4e0b\uff0c\u8fd0\u884c weexpack plugin add/remove \u547d\u4ee4\u76f4\u63a5\u5b89\u88c5/\u5220\u9664 Weex plugin \u5230\u7ec4\u4ef6\u5bb9\u5668\u4e2d\u3002
+
+* \u7ec4\u4ef6\u5bb9\u5668\u83b7\u53d6
+ * \u65b9\u5f0f1\uff1a\u901a\u8fc7\u7b2c\u4e8c\u6b65<sup>[[link](#weex-plugin)]</sup>\u751f\u6210\u7684 Android/iOS \u76ee\u5f55\u4e2d\u5305\u542b Weexplugin \u76ee\u5f55\uff0c\u6b64\u76ee\u5f55\u662f\u7ec4\u4ef6\u5bb9\u5668
+ * \u65b9\u5f0f2\uff1a\u901a\u8fc7 repo \u5730\u5740 clone \u4ee3\u7801 [iOS\u5730\u5740](https://github.com/weexteam/weexpluginContainer-iOS) [Android \u5730\u5740](https://github.com/weexteam/weexplugin-android)
+
+## \u63d2\u4ef6\u53d1\u5e03
+
+\u5bf9\u4e8e\u63d2\u4ef6\u5f00\u53d1\u8005\u6765\u8bf4\uff0c\u4e5f\u6709\u4e00\u7ec4\u7528\u4e8e\u521b\u5efa\u548c\u53d1\u5e03\u63d2\u4ef6\u7684\u547d\u4ee4\uff0c[\u524d\u5f80](./README_plugin.md) \u67e5\u770b\u8be6\u7ec6\u6587\u6863
+
+
+
+## \u63d2\u4ef6\u5f00\u53d1\u6587\u6863
+
++ [\u5f00\u53d1 web \u7684\u63d2\u4ef6\u6559\u7a0b](./doc/plugin-devloping-web.md)
+
+
+## \u793a\u4f8b
+[\u4f7f\u7528 Weexpack \u6253\u5305\u51fa\u4e00\u4e2a Weex \u7248\u7684 \u300aOne App\u300b](https://github.com/weexteam/weex-pack/wiki/Create-Weex-One-App-with-Weexpack)
+
+[1]: https://nodejs.org/
+[2]: https://www.npmjs.com/
+[3]: https://itunes.apple.com/us/app/xcode/id497799835?mt=12
+[4]: https://developer.android.com/studio/install.html
+[5]: https://developer.android.com/studio/run/managing-avds.html
+[6]: https://www.docker.com/
+[7]: https://developer.android.com/studio/releases/sdk-tools.html
+[8]: https://developer.android.com/studio/run/managing-avds.html
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/common-style.md b/doc/source/cn/references/common-style.md
index 033a45c..4c12380 100644
--- a/doc/source/cn/references/common-style.md
+++ b/doc/source/cn/references/common-style.md
@@ -91,15 +91,16 @@ Weex \u5bf9\u4e8e\u957f\u5ea6\u503c\u76ee\u524d\u53ea\u652f\u6301*\u50cf\u7d20*\u503c\uff0c\u4e0d\u652f\u6301\u76f8\u5bf9\u5355\u4f4d\uff08`em`\u3001
### \u6ce8\u610f\uff1a
+
Weex \u76d2\u6a21\u578b\u7684 `box-sizing` \u9ed8\u8ba4\u4e3a `border-box`\uff0c\u5373\u76d2\u5b50\u7684\u5bbd\u9ad8\u5305\u542b\u5185\u5bb9\u3001\u5185\u8fb9\u8ddd\u548c\u8fb9\u6846\u7684\u5bbd\u5ea6\uff0c\u4e0d\u5305\u542b\u5916\u8fb9\u8ddd\u7684\u5bbd\u5ea6\u3002
-\u76ee\u524d\u5728 `<image>` \u7ec4\u4ef6\u4e0a\u5c1a\u65e0\u6cd5\u53ea\u5b9a\u4e49\u4e00\u4e2a\u6216\u51e0\u4e2a\u89d2\u7684 `border-radius`\u3002\u6bd4\u5982\u4f60\u65e0\u6cd5\u5728\u8fd9\u4e24\u4e2a\u7ec4\u4ef6\u4e0a\u4f7f\u7528 `border-top-left-radius`\u3002\u8be5\u7ea6\u675f\u53ea\u5bf9iOS\u751f\u6548\uff0cAndroid\u5e76\u4e0d\u53d7\u6b64\u9650\u5236\u3002
+\u76ee\u524d\u5728 `<image>` \u7ec4\u4ef6\u4e0a\u5c1a\u65e0\u6cd5\u53ea\u5b9a\u4e49\u4e00\u4e2a\u6216\u51e0\u4e2a\u89d2\u7684 `border-radius`\u3002\u6bd4\u5982\u4f60\u65e0\u6cd5\u5728\u8fd9\u4e24\u4e2a\u7ec4\u4ef6\u4e0a\u4f7f\u7528 `border-top-left-radius`\u3002\u8be5\u7ea6\u675f\u53ea\u5bf9 iOS \u751f\u6548\uff0cAndroid \u5e76\u4e0d\u53d7\u6b64\u9650\u5236\u3002
-\u5c3d\u7ba1 `overflow:hidden` \u5728android\u4e0a\u662f\u9ed8\u8ba4\u884c\u4e3a\uff0c\u4f46\u53ea\u6709\u4e0b\u5217\u6761\u4ef6\u90fd\u6ee1\u8db3\u65f6\uff0c\u4e00\u4e2a\u7236view\u624d\u4f1a\u53bbclip\u5b83\u7684\u5b50view\u3002\u8fd9\u4e2a\u9650\u5236\u53ea\u5bf9Android\u751f\u6548\uff0ciOS\u4e0d\u53d7\u5f71\u54cd\u3002
+\u5c3d\u7ba1 `overflow:hidden` \u5728 Android \u4e0a\u662f\u9ed8\u8ba4\u884c\u4e3a\uff0c\u4f46\u53ea\u6709\u4e0b\u5217\u6761\u4ef6\u90fd\u6ee1\u8db3\u65f6\uff0c\u4e00\u4e2a\u7236 view \u624d\u4f1a\u53bb clip \u5b83\u7684\u5b50 view\u3002\u8fd9\u4e2a\u9650\u5236\u53ea\u5bf9 Android \u751f\u6548\uff0ciOS \u4e0d\u53d7\u5f71\u54cd\u3002
* \u7236view\u662f`div`, `a`, `cell`, `refresh` \u6216 `loading`\u3002
-* \u7cfb\u7edf\u7248\u672c\u662fAndroid 4.3\u6216\u66f4\u9ad8\u3002
-* \u7cfb\u7edf\u7248\u672c\u4e0d\u662fAndorid 7.0\u3002
-* \u7236view\u6ca1\u6709`background-image`\u5c5e\u6027\u6216\u7cfb\u7edf\u7248\u672c\u662fAndroid 5.0\u6216\u66f4\u9ad8\u3002
+* \u7cfb\u7edf\u7248\u672c\u662f Android 4.3 \u6216\u66f4\u9ad8\u3002
+* \u7cfb\u7edf\u7248\u672c\u4e0d\u662f Andorid 7.0\u3002
+* \u7236 view \u6ca1\u6709 `background-image` \u5c5e\u6027\u6216\u7cfb\u7edf\u7248\u672c\u662f Android 5.0 \u6216\u66f4\u9ad8\u3002
### \u793a\u4f8b\uff1a
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/cn/references/components/scroller.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/scroller.md b/doc/source/cn/references/components/scroller.md
index 694ce87..297f712 100644
--- a/doc/source/cn/references/components/scroller.md
+++ b/doc/source/cn/references/components/scroller.md
@@ -33,10 +33,10 @@ version: 2.1
- `show-scrollbar {boolean}`\uff1a\u53ef\u9009\u503c\u4e3a `true`/ `false`\uff0c\u9ed8\u8ba4\u503c\u4e3a `true`\u3002\u63a7\u5236\u662f\u5426\u51fa\u73b0\u6eda\u52a8\u6761\u3002
- `scroll-direction {string}`\uff1a\u53ef\u9009\u4e3a `horizontal` \u6216\u8005 `vertical`\uff0c\u9ed8\u8ba4\u503c\u4e3a `vertical` \u3002\u5b9a\u4e49\u6eda\u52a8\u7684\u65b9\u5411\u3002
- - `scroll-direction`\u5b9a\u4e49\u4e86scroller\u7684\u6eda\u52a8\u65b9\u5411\uff0c`flex-direction`\u5b9a\u4e49\u4e86scroller\u7684\u5e03\u5c40\u65b9\u5411\uff0c\u4e24\u4e2a\u65b9\u5411\u5fc5\u987b\u4e00\u81f4\u3002
- - `scroll-direction`\u7684\u9ed8\u8ba4\u503c\u662f`vertical`,`flex-direction`\u7684\u9ed8\u8ba4\u503c\u662f`row`\u3002
- - \u5f53\u9700\u8981\u4e00\u4e2a\u6c34\u5e73\u65b9\u5411\u7684scroller\u65f6\uff0c\u4f7f\u7528`scroll-direction:horizontal`\u548c`flex-direction: row`\u3002
- - \u5f53\u9700\u8981\u4e00\u4e2a\u7ad6\u76f4\u65b9\u5411\u7684scroller\u65f6\uff0c\u4f7f\u7528`scroll-direction:vertical`\u548c`flex-direction: column`\u3002\u7531\u4e8e\u8fd9\u4e24\u4e2a\u503c\u5747\u662f\u9ed8\u8ba4\u503c\uff0c\u5f53\u9700\u8981\u4e00\u4e2a\u7ad6\u76f4\u65b9\u5411\u7684scroller\u65f6\uff0c\u8fd9\u4e24\u4e2a\u503c\u53ef\u4ee5\u4e0d\u8bbe\u7f6e\u3002
+ - `scroll-direction`\u5b9a\u4e49\u4e86 scroller \u7684\u6eda\u52a8\u65b9\u5411\uff0c`flex-direction` \u5b9a\u4e49\u4e86 scroller \u7684\u5e03\u5c40\u65b9\u5411\uff0c\u4e24\u4e2a\u65b9\u5411\u5fc5\u987b\u4e00\u81f4\u3002
+ - `scroll-direction` \u7684\u9ed8\u8ba4\u503c\u662f `vertical`, `flex-direction` \u7684\u9ed8\u8ba4\u503c\u662f `row`\u3002
+ - \u5f53\u9700\u8981\u4e00\u4e2a\u6c34\u5e73\u65b9\u5411\u7684 scroller \u65f6\uff0c\u4f7f\u7528 `scroll-direction:horizontal` \u548c `flex-direction: row`\u3002
+ - \u5f53\u9700\u8981\u4e00\u4e2a\u7ad6\u76f4\u65b9\u5411\u7684 scroller \u65f6\uff0c\u4f7f\u7528 `scroll-direction:vertical` \u548c `flex-direction: column`\u3002\u7531\u4e8e\u8fd9\u4e24\u4e2a\u503c\u5747\u662f\u9ed8\u8ba4\u503c\uff0c\u5f53\u9700\u8981\u4e00\u4e2a\u7ad6\u76f4\u65b9\u5411\u7684 scroller \u65f6\uff0c\u8fd9\u4e24\u4e2a\u503c\u53ef\u4ee5\u4e0d\u8bbe\u7f6e\u3002
- `loadmoreoffset {number}`\uff1a\u9ed8\u8ba4\u503c\u4e3a 0\uff0c\u89e6\u53d1 `loadmore` \u4e8b\u4ef6\u6240\u9700\u8981\u7684\u5782\u76f4\u504f\u79fb\u8ddd\u79bb\uff08\u8bbe\u5907\u5c4f\u5e55\u5e95\u90e8\u4e0e\u9875\u9762\u5e95\u90e8\u4e4b\u95f4\u7684\u8ddd\u79bb\uff09\u3002\u5f53\u9875\u9762\u7684\u6eda\u52a8\u6761\u6eda\u52a8\u5230\u8db3\u591f\u63a5\u8fd1\u9875\u9762\u5e95\u90e8\u65f6\u5c06\u4f1a\u89e6\u53d1 `loadmore` \u8fd9\u4e2a\u4e8b\u4ef6\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/dev-with-weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/dev-with-weexpack.md b/doc/source/guide/dev-with-weexpack.md
deleted file mode 100644
index 9dd9b42..0000000
--- a/doc/source/guide/dev-with-weexpack.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Build A New App
-type: guide
-order: 2
-version: 2.1
-has_chapter_content: true
----
-
-# Build a New App
-
-
-Work in progress.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/index.md b/doc/source/guide/index.md
index 6c11d54..c43176a 100644
--- a/doc/source/guide/index.md
+++ b/doc/source/guide/index.md
@@ -56,55 +56,3 @@ As shown in the following code\uff1a
It's too easy\uff0cright? Let's focus on the syntax, obviously this is vue.
You can try to modify the Hello World, then generate a new QR code to scan.
-
-## Set up development environment
-
-Use dotWe is a good choice, But if you want to develop locally on your own machine, you will set up your development environment.
-
-You will need Node.js and the Weex CLi.
-
-You can installing Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm:
-
-```bash
-$ nvm install 6.10.0
-$ nvm use 6.10.0
-```
-
-Node.js comes with npm, which lets you install the Weex Cli.
-
-Run the following command in a Terminal:
-
-```bash
-$ npm install -g weex-toolkit@beta
-```
-
-**NOTE: ** If you get an error like "permission error", try installing with `sudo`.
-
-
-Then you can use the weex command to verify that the installation is successful:
-
-
-
-### Generate a new Weex project
-
-You can use CLi to generate a Weex project called "awesome-project". Run the following command in a Terminal:
-
-```bash
-$ weex init awesome-project
-```
-
-Then we enter the awesome-project folder, the CLi has been for us to generate a standard project structure.
-
-### Usage
-
-We enter the awesome-project folder and install dependencies with the following commands:
-
-```bash
-npm install
-```
-
-Then we run `npm run dev` and `npm run serve` to start watch mode and static server.
-
-Finally, we can see the Weex page in `http://localhost:8080/index.html`.
-
-If you're curious to learn more about technical details, continue on to the next. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/app-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/app-architecture.md b/doc/source/guide/intro/app-architecture.md
index d7b3bc6..5dd1e1f 100644
--- a/doc/source/guide/intro/app-architecture.md
+++ b/doc/source/guide/intro/app-architecture.md
@@ -1,7 +1,7 @@
---
title: Mobile App Architecture
type: guide
-order: 4.5
+order: 5.5
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/devtools.md b/doc/source/guide/intro/devtools.md
index 3104e02..f9b32b4 100644
--- a/doc/source/guide/intro/devtools.md
+++ b/doc/source/guide/intro/devtools.md
@@ -1,7 +1,7 @@
---
title: Using Devtools
type: guide
-order: 4.7
+order: 5.7
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/how-it-works.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/how-it-works.md b/doc/source/guide/intro/how-it-works.md
index f67f8b4..e66ead8 100644
--- a/doc/source/guide/intro/how-it-works.md
+++ b/doc/source/guide/intro/how-it-works.md
@@ -1,7 +1,7 @@
---
title: How it works
type: guide
-order: 4.1
+order: 5.1
has_chapter_content: false
chapter_title: Intro
version: 2.1
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/index.md b/doc/source/guide/intro/index.md
index 24c8236..54117fc 100644
--- a/doc/source/guide/intro/index.md
+++ b/doc/source/guide/intro/index.md
@@ -1,7 +1,7 @@
---
title: Intro
type: guide
-order: 4
+order: 5
has_chapter_content: false
chapter_title: Intro
version: 2.1
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/page-architecture.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/page-architecture.md b/doc/source/guide/intro/page-architecture.md
index a9d8014..77085f9 100644
--- a/doc/source/guide/intro/page-architecture.md
+++ b/doc/source/guide/intro/page-architecture.md
@@ -1,7 +1,7 @@
---
title: Weex Page Architecture
type: guide
-order: 4.6
+order: 5.6
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/using-vue.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/using-vue.md b/doc/source/guide/intro/using-vue.md
index 9d981ee..0f08498 100644
--- a/doc/source/guide/intro/using-vue.md
+++ b/doc/source/guide/intro/using-vue.md
@@ -1,7 +1,7 @@
---
title: Using Vue
type: guide
-order: 4.3
+order: 5.3
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/web-dev-experience.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/web-dev-experience.md b/doc/source/guide/intro/web-dev-experience.md
index 81d0ff2..c24c8cc 100644
--- a/doc/source/guide/intro/web-dev-experience.md
+++ b/doc/source/guide/intro/web-dev-experience.md
@@ -1,7 +1,7 @@
---
title: Web Dev Experience
type: guide
-order: 4.2
+order: 5.2
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/intro/write-once.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/intro/write-once.md b/doc/source/guide/intro/write-once.md
index 382b7b4..9507d21 100644
--- a/doc/source/guide/intro/write-once.md
+++ b/doc/source/guide/intro/write-once.md
@@ -1,7 +1,7 @@
---
title: Write once, Run Everywhere
type: guide
-order: 4.4
+order: 5.4
version: 2.1
---
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/set-up-env.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/set-up-env.md b/doc/source/guide/set-up-env.md
new file mode 100644
index 0000000..338502b
--- /dev/null
+++ b/doc/source/guide/set-up-env.md
@@ -0,0 +1,93 @@
+---
+title: Set Up Development Environment
+type: guide
+order: 2
+version: 2.1
+has_chapter_content: true
+---
+
+# Set up development environment
+
+Use dotWe is a good choice, But if you want to develop locally on your own machine, you will set up your development environment.
+
+You will need Node.js and the Weex CLi.
+
+You can installing Node using [nvm](https://github.com/creationix/nvm) (Simple bash script to manage multiple active node.js versions). Run the following commands in a Terminal after installing nvm:
+
+```bash
+$ nvm install 6.10.0
+$ nvm use 6.10.0
+```
+
+Node.js comes with npm, which lets you install the Weex Cli.
+
+Run the following command in a Terminal:
+
+```bash
+$ npm install -g weex-toolkit
+$ weex -v
+
+v1.0.3
+weex-builder : v0.2.4
+weex-previewer : v1.3.4
+```
+
+**NOTE: ** If you get an error like "permission error", try installing with `sudo`.
+
+
+Then you can use the weex command to verify that the installation is successful:
+
+
+
+### Generate a new Weex project
+
+You can use CLi to generate a Weex project called "awesome-project". Run the following command in a Terminal:
+
+```bash
+$ weex init awesome-project
+```
+
+Then we enter the awesome-project folder, the CLi has been for us to generate a standard project structure.
+
+### Usage
+
+We enter the awesome-project folder and install dependencies with the following commands:
+
+```bash
+npm install
+```
+
+Then we run `npm run dev` and `npm run serve` to start watch mode and static server.
+
+Finally, we can see the Weex page in `http://localhost:8080/index.html`.
+
+You can modify this page in `src/foo.vue`. The code is shown below:
+
+```html
+<template>
+ <div class="wrapper">
+ <text class="weex">Hello Weex !</text>
+ <text class="vue">Hello Vue !</text>
+ </div>
+</template>
+
+<style scoped>
+ .wrapper {
+ flex-direction: column;
+ justify-content: center;
+ }
+ .weex {
+ font-size: 60px;
+ text-align: center;
+ color: #1B90F7;
+ }
+ .vue {
+ font-size: 60px;
+ text-align: center;
+ margin-top: 30px;
+ color: #41B883;
+ }
+</style>
+```
+
+If you're curious to learn more about technical details, continue on to the next. And don't forget to write code at [dotWe](https://dotwe.org) and preview at anytime.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/tools/devtools.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/devtools.md b/doc/source/guide/tools/devtools.md
new file mode 100644
index 0000000..9fd9de3
--- /dev/null
+++ b/doc/source/guide/tools/devtools.md
@@ -0,0 +1,100 @@
+---
+title: Using Devtools
+type: guide
+order: 4.1
+version: 2.1
+---
+
+# Devtools
+
+Weex devtools is a custom devtools for weex that implements [Chrome Debugging Protocol](https://developer.chrome.com/devtools/docs/debugger-protocol), it is designed to help you quickly inspect your app and debug your JS bundle source in a chrome web page, both Android and IOS platform are supported.
+
+## Install
+
+```
+ $ npm install -g weex-toolkit
+```
+#### usage
+```
+weex debug [options] [we_file|bundles_dir]
+
+ Options:
+
+ -h, --help output usage information
+ -V, --verbose display logs of debugger server
+ -v, --version display version
+ -p, --port [port] set debugger server port
+ -e, --entry [entry] set the entry bundlejs path when you specific the bundle server root path
+ -m, --mode [mode] set build mode [transformer|loader]
+ -w, --watch watch we file changes auto build them and refresh debugger page![default enabled]
+```
+
+#### start debugger
+```
+$weex debug
+```
+this command will start debug server and launch a chrome opening `DeviceList` page.
+this page will display a qrcode ,you can use `Playground App` scan it for starting debug.
+
+#### start debugger with a we file
+```
+$weex debug your_weex.we
+```
+this command will compile `your_weex.we` to `your_weex.js` and start the debug server as upon command.
+`your_weex.js` will deploy on the server and displayed in `DeviceList` page as another qrcode contain the url of your_weex.js
+
+
+#### start debugger with a directory of we files
+```
+$weex debug your/we/path -e index.we
+```
+this command will build every file in your/we/path and deploy them on the bundle server. your directory will mapping to http://localhost:port/weex/
+use -e to set the entry of these bundles. and the url of "index.we" will display on device list page as another qrcode.
+
+## Features
+
+### Connect devices
+
+
+### Inspector
+ Inspector can be used to show your `Element` \ `Network` \ `Console log` \ `ScreenCast` \ `BoxModel` \ `Native View` and so on.
+
+
+
+#### Element
+##### native view element
+
+
+##### weex dom element
+
+
+#### Network
+
+##### show the total time and latency
+
+
+##### show the header and response
+
+
+#### Console
+
+
+#### Resource
+
+
+### Debugger
+
+ Debugger can be used to debug your bundle js source, you can set `Breakpoint` \ watch `CallStack`.
+
+
+
+#### Breakpoint and CallStack
+
+
+
+## Integrate devtools
+
+* Android
+ * See the doc [Weex devtools (Android)](../../references/advanced/integrate-devtool-to-android.html), it will lead you to config and use it step by step.
+* IOS
+ * See the doc [Weex devtools (iOS)](../../references/advanced/integrate-devtool-to-ios.html), it will lead you to config and use it step by step.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/tools/index.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/index.md b/doc/source/guide/tools/index.md
new file mode 100644
index 0000000..8a2de8e
--- /dev/null
+++ b/doc/source/guide/tools/index.md
@@ -0,0 +1,11 @@
+---
+title: Tools
+type: guide
+order: 4
+version: 2.1
+---
+
+# Tools
+
+- [Devtools](./devtools.html)
+- [Weexpack](./weexpack.html)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9dd6bdd4/doc/source/guide/tools/weexpack.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/tools/weexpack.md b/doc/source/guide/tools/weexpack.md
new file mode 100644
index 0000000..699431f
--- /dev/null
+++ b/doc/source/guide/tools/weexpack.md
@@ -0,0 +1,298 @@
+---
+title: Using Weexpack
+type: guide
+order: 4.2
+version: 2.1
+---
+
+# Using Weexpack
+
+## Weexpack introduction
+
+Weexpack is our next generation of engineering development kits, it helps to setup wWex application from scratch quickly. With simple commands, developers could create a Weex project, add different platform template, could install plugins from local, GitHub or Weex market, could pack up his application project and run on mobile. For those who would like to share his own plugins, he could publish them to the Weex market.
+
+weexpack commands can be grouped to three parts:
+* application package
+ * **weexpack create** \u2014 create Weex project.
+ * **weexpack platform add/remove** \u2014 add\uff0fremove Weex platform template\uff0cit support plugins and Weex bundle debugging by default.
+ * **weexpack platform list** \u2014 query installed platforms and its version.
+ * **weexpack platform run** - pack/build/run application.
+
+* plugin usuage
+ * **weexpack plugin add/remove** \u2014 add/remove Weex plugin, support to install from local, Github or market.
+ * **weexpack plugin list** \u2014 query installed plugins and its version.
+
+* plugin development
+ * **weexpack plugin create** - create plugin template with necessary config file and directory.
+ * **weexpack plugin publish** - publish plugin to market.
+
+
+## Installation
+### pre-environmental requirements
+
+- Supported on Mac linux windows.
+- Configure the [Node.js] [1] environment and install the [npm] [2] package manager.(need node 6.0+)
+- Configure iOS development environment:
+ - Install [Xcode IDE] [3] to launch Xcode once so that Xcode automatically installs the Developer Tools and confirms the usage protocol.
+ - Install cocoaPods
+- Configure the Android development environment:
+ - Install [Android Studio] [4] and open the new project. Open the menu bar, open the [AVD Manager] [5], the new Android emulator and start. (If you have installed [Docker] [6], close the Docker Server.)
+ - Or just download the [Android SDK] [7], run the command line [AVD Manager] [8], create a new Android emulator and launch it.
+ - Make sure that Android build-tool version is 23.0.2
+
+### Instructions
+
+First, install the weex-pack command globally:
+
+```bash
+$ npm install -g weexpack
+```
+
+or run the following command under the root path of your cloned weexpack repo
+
+```bash
+$ npm install
+```
+
+## Pack application (and plugin usuage)
+
+Following graph shows how to pack a application, plugin related parts werenot a must.
+
+
+
+### Steps in detail
+
+#### 1. create a weexpack project
+
+```bash
+$ weexpack create appName
+```
+
+will create directory as follows\uff1a
+
+```
+WeexProject
+\u251c\u2500\u2500 README.md
+\u251c\u2500\u2500 android.config.json
+\u251c\u2500\u2500 config.xml
+\u251c\u2500\u2500 hooks
+\u2502�� \u2514\u2500\u2500 README.md
+\u251c\u2500\u2500 ios.config.json
+\u251c\u2500\u2500 package.json
+\u251c\u2500\u2500 platforms // platform template directory
+\u251c\u2500\u2500 plugins // plugins download to here
+\u2502�� \u2514\u2500\u2500 README.md
+\u251c\u2500\u2500 src // application\uff08we/vue file\uff09directory
+\u2502�� \u2514\u2500\u2500 index.we
+\u251c\u2500\u2500 start
+\u251c\u2500\u2500 start.bat
+\u251c\u2500\u2500 tools
+\u2502�� \u2514\u2500\u2500 webpack.config.plugin.js
+\u251c\u2500\u2500 web
+\u2502�� \u251c\u2500\u2500 index.html
+\u2502�� \u251c\u2500\u2500 index.js
+\u2502�� \u2514\u2500\u2500 js
+\u2502�� \u2514\u2500\u2500 init.js
+\u2514\u2500\u2500 webpack.config.js
+```
+
+Above project template has no ios/android directory by default, you should change to appName path to install necessary dependency.
+
+```bash
+$ cd appName && npm install
+```
+
+#### 2. install Weex application template
+
+Application template by default support Weex plugins and Weex bundle debugging. Please note template name are in lower-case, template was installed under platforms directory.
+
+* android template
+
+```bash
+$ weexpack platform add android
+```
+
+* ios template
+
+```bash
+$ weexpack platform add ios
+```
+
+Take android platform as example\uff0cthe directory under platforms looks as following:
+
+```
+platforms
+\u2514\u2500\u2500 android
+ \u251c\u2500\u2500 LICENSE
+ \u251c\u2500\u2500 NOTICE
+ \u251c\u2500\u2500 README.md
+ \u251c\u2500\u2500 app
+ \u2502�� \u251c\u2500\u2500 build
+ \u2502�� \u251c\u2500\u2500 build.gradle
+ \u2502�� \u251c\u2500\u2500 proguard-rules.pro
+ \u2502�� \u2514\u2500\u2500 src
+ \u251c\u2500\u2500 appframework
+ \u2502�� \u251c\u2500\u2500 build
+ \u2502�� \u251c\u2500\u2500 build.gradle
+ \u2502�� \u251c\u2500\u2500 proguard-rules.pro
+ \u2502�� \u2514\u2500\u2500 src
+ \u251c\u2500\u2500 build
+ \u2502�� \u2514\u2500\u2500 generated
+ \u251c\u2500\u2500 build.gradle
+ \u251c\u2500\u2500 codeStyleSettings.xml
+ \u251c\u2500\u2500 gradle
+ \u2502�� \u2514\u2500\u2500 wrapper
+ \u251c\u2500\u2500 gradle.properties
+ \u251c\u2500\u2500 gradlew
+ \u251c\u2500\u2500 gradlew.bat
+ \u251c\u2500\u2500 settings.gradle
+ \u2514\u2500\u2500 weexplugin
+ \u251c\u2500\u2500 build.gradle
+ \u251c\u2500\u2500 proguard-rules.pro
+ \u2514\u2500\u2500 src
+
+```
+
+* query installed platforms
+
+ ```bash
+ $ weexpack platform list
+ ```
+
+ you will get result like\uff1a
+
+ ```
+ Installed platforms:
+ android
+ Available platforms:
+ android ^6.2.1
+ ```
+
+* remove platform template
+
+ Please use remove command to remove unnecessary platform, for example user want to remove ios template in windows platform.
+
+ ```bash
+ $ weexpack platform remove ios
+ ```
+
+#### 3. install Weex plugin\uff08optional\uff09
+
+* add plugins from local
+
+ ```bash
+ $ weexpack plugin add path/to/plugin
+ ```
+
+* add plugins from Weex market\uff0cfor example weex-chart
+
+ ```bash
+ $ weexpack plugin add weex-chart
+ ```
+
+ weexplugin directory was the target directory where plugin was installed. Take android as an example\uff1a
+
+ ```
+ weexplugin
+ \u251c\u2500\u2500 build.gradle // plugin build script, maintained by weexpack tool
+ \u251c\u2500\u2500 libs
+ \u251c\u2500\u2500 proguard-rules.pro
+ \u251c\u2500\u2500 src
+ \u2502 \u2514\u2500\u2500 main
+ \u2502 \u251c\u2500\u2500 AndroidManifest.xml // plugin android manifest file
+ \u2502 \u251c\u2500\u2500 java
+ \u2502 \u2502 \u251c\u2500\u2500 // \u63d2\u4ef6src\u5b89\u88c5\u76ee\u5f55
+ \u2502 \u2502 \u2514\u2500\u2500 com
+ \u2502 \u2502 \u2514\u2500\u2500 alibaba
+ \u2502 \u2502 \u2514\u2500\u2500 weex
+ \u2502 \u2502 \u2514\u2500\u2500 plugin
+ \u2502 \u2502 \u251c\u2500\u2500 ConfigXmlParser.java // config file parser
+ \u2502 \u2502 \u251c\u2500\u2500 PluginConfig.java // external interface
+ \u2502 \u2502 \u251c\u2500\u2500 PluginEntry.java // plugin description
+ \u2502 \u2502 \u2514\u2500\u2500 PluginManager.java // plugin manager
+ \u2502 \u2514\u2500\u2500 res // plugin resource path
+ \u2502 \u251c\u2500\u2500 drawable
+ \u2502 \u251c\u2500\u2500 values
+ \u2502 \u2502 \u2514\u2500\u2500 strings.xml
+ \u2502 \u2514\u2500\u2500 xml
+ \u2502 \u2514\u2500\u2500 config.xml // plugin config file, which used by PluginManager when install
+ ```
+
+* query installed plugins
+
+ ```bash
+ $ weexpack plugin list
+ ```
+
+* remove installed plugin\uff0cfor example weex-chart
+
+ ```bash
+ $ weexpack plugin remove weex-chart
+ ```
+
+#### 4. pack application and run
+
+After all above steps, you could modify your application we/vue files under src directory. And then, use run command to pack and run your application. Run command will download building tools and all dependencies which may take a while, and open monitor or connect to mobile device to execute your application afterwards.
+
+* for android application
+
+ ```bash
+ $ weexpack run android
+ ```
+
+ You could modify your project information in android.config.json file:
+
+ - AppName: the name of the project
+ - AppId: application_id the name of the package
+ - SplashText: the text in welcome page
+ - WeexBundle: the bundle file (could be local file or remote url). For Local file please put your we/vue files under the src directory
+
+* for ios platform
+
+ * simulator
+
+ ```bash
+ $ weexpack run ios
+ ```
+
+ * Build ipa
+
+ ```bash
+ $ weexpack build ios
+ ```
+
+ this command will prompt for CodeSign, Profile(provisioning profile), AppId to build ipa. Other information like AppName, Weex bundle could be configured as you like in the file ios.config.json. After this command, ipa file could be created under the directory `/playground/build/ipa_build/`.
+
+ Note: For details about various requirements to deploy to a device, refer to the Launch Your App On Devices section of Apple's [About App Distribution Workflows][9]. Briefly, you need to do the following before deploying:
+
+ 1. CodeSign should be installed to keychain, click keychain to get the id;
+ 2. provisioning profile need UUID. you could use the file mobileprovision_UUID.sh to generate UUID as follows:
+
+ ```
+ $ ./mobileprovision_UUID.sh abcpath
+ ```
+ abcpath is the path of provisioning profile file.
+
+* for Web platform
+
+ ```bash
+ $ weexpack run web
+ ```
+
+## Plugin development and publishment
+
+
+
+## Examples
+
+ [Create Weex One App with Weexpack](https://github.com/weexteam/weex-pack/wiki/Create-Weex-One-App-with-Weexpack)
+
+ [1]: https://nodejs.org/
+ [2]: https://www.npmjs.com/
+ [3]: https://itunes.apple.com/us/app/xcode/id497799835?mt=12
+ [4]: https://developer.android.com/studio/install.html
+ [5]: https://developer.android.com/studio/run/managing-avds.html
+ [6]: https://www.docker.com/
+ [7]: https://developer.android.com/studio/releases/sdk-tools.html
+ [8]: https://developer.android.com/studio/run/managing-avds.html
+ [9]: https://developer.apple.com/library/content/documentation/IDEs/Conceptual/AppDistributionGuide/Introduction/Introduction.html
[24/50] incubator-weex git commit: * [doc] Update some examples.
Posted by cx...@apache.org.
* [doc] Update some examples.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/90344359
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/90344359
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/90344359
Branch: refs/heads/0.11-dev
Commit: 9034435958399bae2b568b36590d194b12e950bb
Parents: 2d7b868
Author: Yun Dong <yu...@gmail.com>
Authored: Fri Mar 10 14:50:12 2017 +0800
Committer: Yun Dong <yu...@gmail.com>
Committed: Fri Mar 10 14:50:12 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/components/a.md | 19 -------------------
doc/source/cn/references/components/div.md | 10 +++++-----
doc/source/cn/references/components/image.md | 16 ++++++++--------
doc/source/cn/references/components/list.md | 4 ----
doc/source/cn/references/modules/globalevent.md | 2 +-
doc/source/cn/references/path.md | 2 +-
.../cn/v-0.10/references/modules/globalevent.md | 2 +-
doc/source/references/components/image.md | 5 ++---
doc/source/references/modules/globalevent.md | 2 +-
.../v-0.10/references/modules/globalevent.md | 2 +-
10 files changed, 20 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/references/components/a.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/a.md b/doc/source/cn/references/components/a.md
index f6fd610..5e54b0c 100644
--- a/doc/source/cn/references/components/a.md
+++ b/doc/source/cn/references/components/a.md
@@ -44,25 +44,6 @@ version: 2.1
## \u7ea6\u675f
- **\u4e0d\u80fd**\u76f4\u63a5\u5728 `<a>` \u4e2d\u6dfb\u52a0\u6587\u672c\u3002
- \u9519\u8bef\u793a\u4f8b\uff0c\u201cclick\u201d \u65e0\u6cd5\u88ab\u6b63\u5e38\u6e32\u67d3\u3002
-
- ```html
- <template>
- <div class="wrapper">
- <a href="http://dotwe.org/raw/dist/a468998152ee680413588c38bd61c29e.js">
- click
- </a>
- </div>
- </template>
-
- <style>
- .wrapper {
- text-align: center;
- }
- </style>
- ```
-
- [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/0a22d65138691a208e3fb1f8f6392b38)
- \u8bf7\u4e0d\u8981\u4e3a `<a>` \u6dfb\u52a0 `click` \u4e8b\u4ef6\u3002\u6211\u4eec\u4e0d\u80fd\u786e\u4fdd `click` \u4e8b\u4ef6\u548c `href` \u8df3\u8f6c\u7684\u6267\u884c\u987a\u5e8f\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/references/components/div.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/div.md b/doc/source/cn/references/components/div.md
index 79cfae0..90d8711 100644
--- a/doc/source/cn/references/components/div.md
+++ b/doc/source/cn/references/components/div.md
@@ -24,7 +24,7 @@ version: 2.1
<style>
.text {
- font-size: 70;
+ font-size: 70px;
color: #ff0000
}
</style>
@@ -32,7 +32,7 @@ version: 2.1
<script></script>
```
-[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/a468998152ee680413588c38bd61c29e)
+[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/vue/ea4f528a0b381640b77ba03fcc69a90a)
@@ -84,11 +84,11 @@ version: 2.1
<script></script>
```
- [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/3ef3ba3f0f162b27e24c525250c46a04)
+ [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/vue/541f016de379c8764ddcdd9da0cabc24)
-2. `<div>` \u4e0d\u53ef\u6eda\u52a8\uff0c\u5373\u4f7f\u663e\u5f0f\u8bbe\u7f6e\u9ad8\u5ea6\u4e5f\u4e00\u6837\u3002
+2. `<div>` \u5728 native \u4e2d\u4e0d\u53ef\u6eda\u52a8\uff0c\u5373\u4f7f\u663e\u5f0f\u8bbe\u7f6e\u9ad8\u5ea6\u4e5f\u4e00\u6837\u3002
- [\u9519\u8bef\u793a\u4f8b](http://dotwe.org/a2cc491c5b9e6f6eb06795e45e725efd)
+ [\u9519\u8bef\u793a\u4f8b](http://dotwe.org/vue/6795753d1a51662b8a7282b129dc7ddf)
## \u793a\u4f8b
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/references/components/image.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/image.md b/doc/source/cn/references/components/image.md
index 1c70f10..7755618 100644
--- a/doc/source/cn/references/components/image.md
+++ b/doc/source/cn/references/components/image.md
@@ -7,7 +7,7 @@ version: 2.1
# <image>
-`<image>` \u7ec4\u4ef6\u7528\u4e8e\u6e32\u67d3\u56fe\u7247\uff0c\u5e76\u4e14\u5b83\u4e0d\u80fd\u5305\u542b\u4efb\u4f55\u5b50\u7ec4\u4ef6\u3002\u53ef\u4ee5\u7528 `<img>` \u4f5c\u7b80\u5199\u3002
+`<image>` \u7ec4\u4ef6\u7528\u4e8e\u6e32\u67d3\u56fe\u7247\uff0c\u5e76\u4e14\u5b83\u4e0d\u80fd\u5305\u542b\u4efb\u4f55\u5b50\u7ec4\u4ef6\u3002\u65b0\u7248 Vue 2.0 \u4e2d**\u4e0d\u652f\u6301**\u7528 `<img>` \u4f5c\u7b80\u5199\u3002
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u9700\u8981\u660e\u786e\u6307\u5b9a `width` \u548c `height`\uff0c\u5426\u5219\u56fe\u7247\u65e0\u6cd5\u663e\u793a\u3002
@@ -16,12 +16,12 @@ version: 2.1
```html
<template>
<div>
- <img style="width: 560;height: 560;" src="https://img.alicdn.com/tps/TB1z.55OFXXXXcLXXXXXXXXXXXX-560-560.jpg"></img>
+ <image style="width: 560px;height: 560px;" src="https://img.alicdn.com/tps/TB1z.55OFXXXXcLXXXXXXXXXXXX-560-560.jpg"></image>
</div>
</template>
```
-[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/23b6cf951e6059d2cf7b9a74a9915ace)
+[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/vue/1d6145d98cbdb8c66c69b4d4dcd2744d)
## \u5b50\u7ec4\u4ef6
@@ -30,9 +30,9 @@ version: 2.1
```html
<template>
<div>
- <img style="width:750; height:750;" src="https://img.alicdn.com/tps/TB1z.55OFXXXXcLXXXXXXXXXXXX-560-560.jpg"></img>
+ <image style="width:750px; height:750px;" src="https://img.alicdn.com/tps/TB1z.55OFXXXXcLXXXXXXXXXXXX-560-560.jpg"></image>
<div class="title">
- <text style="font-size:50; color: #ff0000">\u4f60\u597d\uff0cimage</text>
+ <text style="font-size:50px; color: #ff0000">\u4f60\u597d\uff0cimage</text>
</div>
</div>
</template>
@@ -45,7 +45,7 @@ version: 2.1
</style>
```
-[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/08dd49aaca8bf289c5fc08f808b9c08c)
+[\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/vue/0a81d27b5dbc68ea3bf5f9fd56c882e8)
## \u7279\u6027
@@ -66,7 +66,7 @@ version: 2.1
- `placeholder`: <span class="api-version">v0.9+</span> <string> \u5f53\u6e90\u56fe\u7247\u4e0b\u8f7d\u4e2d\u65f6\u663e\u793a\u4e00\u5f20\u5360\u4f4d\u56fe\u3002
- [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/049213ab3364a86637e211c0329cdc50)
+ [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/vue/18e71ab3484bb6751ad77ff7d5195404)
## \u6837\u5f0f
@@ -82,7 +82,7 @@ version: 2.1
## \u4e8b\u4ef6
-- `load`: <sup class="api-version">v0.8+</sup>\uff1a\u5f53\u56fe\u7247\u52a0\u8f7d\u5b8c\u6210\u65f6\u89e6\u53d1\u3002\u76ee\u524d\u5728 Android\u3001iOS \u4e0a\u652f\u6301\uff0cH5 \u6682\u4e0d\u652f\u6301\u3002[\u793a\u4f8b](http://dotwe.org/25bd347da6a59603dd31ec057d2691da)
+- `load`: <sup class="api-version">v0.8+</sup>\uff1a\u5f53\u56fe\u7247\u52a0\u8f7d\u5b8c\u6210\u65f6\u89e6\u53d1\u3002\u76ee\u524d\u5728 Android\u3001iOS \u4e0a\u652f\u6301\uff0cH5 \u6682\u4e0d\u652f\u6301\u3002[\u793a\u4f8b](http://dotwe.org/vue/98ee340348d7cc3e6fbfe68dbaef1eed)
- \u4e8b\u4ef6\u5bf9\u8c61
- `success`: \u5f53\u56fe\u7247\u6210\u529f\u52a0\u8f7d\u65f6\u4e3a`true`\uff0c\u5426\u5219\u4e3a`false`
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/references/components/list.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/components/list.md b/doc/source/cn/references/components/list.md
index 2cb0a90..335eef3 100644
--- a/doc/source/cn/references/components/list.md
+++ b/doc/source/cn/references/components/list.md
@@ -43,8 +43,6 @@ version: 2.1
- `loadmoreoffset {number}`\uff1a\u9ed8\u8ba4\u503c\u4e3a 0\uff0c\u89e6\u53d1 `loadmore` \u4e8b\u4ef6\u6240\u9700\u8981\u7684\u5782\u76f4\u504f\u79fb\u8ddd\u79bb\uff08\u8bbe\u5907\u5c4f\u5e55\u5e95\u90e8\u4e0e `<list>` \u5e95\u90e8\u4e4b\u95f4\u7684\u8ddd\u79bb\uff09\u3002\u5f53 `<list>` \u7684\u6eda\u52a8\u6761\u6eda\u52a8\u5230\u8db3\u591f\u63a5\u8fd1 `<list>` \u5e95\u90e8\u65f6\u5c06\u4f1a\u89e6\u53d1 `loadmore` \u8fd9\u4e2a\u4e8b\u4ef6\u3002
- 
-
## \u6837\u5f0f
- \u901a\u7528\u6837\u5f0f\uff1a\u652f\u6301\u6240\u6709\u901a\u7528\u6837\u5f0f
@@ -61,8 +59,6 @@ version: 2.1
- `loadmore` <sup class="wx-v">0.5+</sup>\uff1a\u5982\u679c\u5217\u8868\u6eda\u52a8\u5230\u5e95\u90e8\u5c06\u4f1a\u7acb\u5373\u89e6\u53d1\u8fd9\u4e2a\u4e8b\u4ef6\uff0c\u4f60\u53ef\u4ee5\u5728\u8fd9\u4e2a\u4e8b\u4ef6\u7684\u5904\u7406\u51fd\u6570\u4e2d\u52a0\u8f7d\u4e0b\u4e00\u9875\u7684\u5217\u8868\u9879\u3002
- [\u4f53\u9a8c\u4e00\u4e0b](http://dotwe.org/bc445ede8746a31360e3607d210304c5)
-
- \u901a\u7528\u4e8b\u4ef6
\u652f\u6301\u6240\u6709\u901a\u7528\u4e8b\u4ef6\uff1a
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/references/modules/globalevent.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/modules/globalevent.md b/doc/source/cn/references/modules/globalevent.md
index d5bf004..f588aa8 100644
--- a/doc/source/cn/references/modules/globalevent.md
+++ b/doc/source/cn/references/modules/globalevent.md
@@ -9,7 +9,7 @@ version: 2.1
<span class="weex-version">0.8 (\u5f00\u53d1\u4e2d)</span>
-`globalEvent` \u7528\u4e8e\u76d1\u542c\u6301\u4e45\u6027\u4e8b\u4ef6\uff0c\u4f8b\u5982\u5b9a\u4f4d\u4fe1\u606f\uff0c\u9640\u87ba\u4eea\u7b49\u7684\u53d8\u5316\u3002\u5168\u5c40\u4e8b\u4ef6\u662f\u9700\u8981\u989d\u5916 APIs \u5904\u7406\u7684\u6b21\u8981 API\u3002\u4f60\u80fd\u901a\u8fc7 `addEventListener` \u6ce8\u518c\u4e8b\u4ef6\u76d1\u542c\uff0c\u5f53\u4f60\u4e0d\u518d\u9700\u8981\u7684\u65f6\u5019\uff0c\u4e5f\u53ef\u4ee5\u901a\u8fc7 `removingEventListener` \u53d6\u6d88\u4e8b\u4ef6\u76d1\u542c\u3002
+`globalEvent` \u7528\u4e8e\u76d1\u542c\u6301\u4e45\u6027\u4e8b\u4ef6\uff0c\u4f8b\u5982\u5b9a\u4f4d\u4fe1\u606f\uff0c\u9640\u87ba\u4eea\u7b49\u7684\u53d8\u5316\u3002\u5168\u5c40\u4e8b\u4ef6\u662f\u9700\u8981\u989d\u5916 APIs \u5904\u7406\u7684\u6b21\u8981 API\u3002\u4f60\u80fd\u901a\u8fc7 `addEventListener` \u6ce8\u518c\u4e8b\u4ef6\u76d1\u542c\uff0c\u5f53\u4f60\u4e0d\u518d\u9700\u8981\u7684\u65f6\u5019\uff0c\u4e5f\u53ef\u4ee5\u901a\u8fc7 `removeEventListener` \u53d6\u6d88\u4e8b\u4ef6\u76d1\u542c\u3002Vue \u7248\u672c\u6682\u4e0d\u652f\u6301 `globalEvent`\u3002
*\u63d0\u9192*
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/references/path.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/references/path.md b/doc/source/cn/references/path.md
index 3d256fb..9e5a889 100644
--- a/doc/source/cn/references/path.md
+++ b/doc/source/cn/references/path.md
@@ -18,7 +18,7 @@ has_chapter_content: true
Weex SDK \u63d0\u4f9b `local` scheme \u6765\u8bbf\u95ee\u6253\u5305\u5728\u5e94\u7528\u7a0b\u5e8f\u4e2d\u7684\u8d44\u6e90\uff0c\u6b64 scheme \u65e0\u6cd5\u5728 H5 \u73af\u5883\u4e0b\u4f7f\u7528\u3002\u76ee\u524d\uff0c\u5f00\u53d1\u8005\u53ef\u4ee5\u5728 `image` \u7ec4\u4ef6\u548c\u5b57\u4f53\u6587\u4ef6\u4e2d\u4f7f\u7528\u672c\u5730\u8d44\u6e90\u3002
- * \u5728 iOS \u4e2d\uff0cWeex \u4f1a\u5728 `bundle resources` \u4e2d\u67e5\u627e\u3002\u4f8b\u5982\uff0c`image` \u7ec4\u4ef6\u7684 `src` \u5c5e\u6027\u4e3a `local\uff1a//app_icon'`\uff0c Weex \u4f1a\u52a0\u8f7d `bundle resouce` \u4e2d\u540d\u4e3a `app_icon` \u7684\u56fe\u50cf\u8d44\u6e90\uff0c\u800c\u5b57\u4f53\u6587\u4ef6\u4e5f\u4ee5\u76f8\u540c\u7684\u65b9\u5f0f\u5de5\u4f5c\u3002
+ * \u5728 iOS \u4e2d\uff0cWeex \u4f1a\u5728 `bundle resources` \u4e2d\u67e5\u627e\u3002\u4f8b\u5982\uff0c`image` \u7ec4\u4ef6\u7684 `src` \u5c5e\u6027\u4e3a `local:///app_icon'`\uff0c Weex \u4f1a\u52a0\u8f7d `bundle resouce` \u4e2d\u540d\u4e3a `app_icon` \u7684\u56fe\u50cf\u8d44\u6e90\uff0c\u800c\u5b57\u4f53\u6587\u4ef6\u4e5f\u4ee5\u76f8\u540c\u7684\u65b9\u5f0f\u5de5\u4f5c\u3002
* \u5728 Android \u4e2d\uff0c`image` \u7ec4\u4ef6\u5c06\u4ece `drawable` \u8d44\u6e90\u6587\u4ef6\u5939\u52a0\u8f7d\uff0c\u5982 `res/drawable-xxx`\u3002\u4f46\u52a0\u8f7d\u5b57\u4f53\u6587\u4ef6\u662f\u4e0d\u540c\u7684\uff0cAndroid \u6846\u67b6\u65e0\u6cd5\u4ece `res` \u52a0\u8f7d\u5b57\u4f53\u6587\u4ef6\uff0c\u56e0\u6b64 SDK \u5c06\u4ece `asserts` \u6587\u4ef6\u5939\u52a0\u8f7d\u5b83\u3002
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/cn/v-0.10/references/modules/globalevent.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/v-0.10/references/modules/globalevent.md b/doc/source/cn/v-0.10/references/modules/globalevent.md
index 05c9e7a..9a04dc0 100644
--- a/doc/source/cn/v-0.10/references/modules/globalevent.md
+++ b/doc/source/cn/v-0.10/references/modules/globalevent.md
@@ -8,7 +8,7 @@ version: 0.10
# \u5168\u5c40\u4e8b\u4ef6
<span class="weex-version">0.8 (\u5f00\u53d1\u4e2d)</span>
-`globalEvent` \u7528\u4e8e\u76d1\u542c\u6301\u4e45\u6027\u4e8b\u4ef6\uff0c\u4f8b\u5982\u5b9a\u4f4d\u4fe1\u606f\uff0c\u9640\u87ba\u4eea\u7b49\u7684\u53d8\u5316\u3002\u5168\u5c40\u4e8b\u4ef6\u662f\u9700\u8981\u989d\u5916 APIs \u5904\u7406\u7684\u6b21\u8981 API\u3002\u4f60\u80fd\u901a\u8fc7 `addEventListener` \u6ce8\u518c\u4e8b\u4ef6\u76d1\u542c\uff0c\u5f53\u4f60\u4e0d\u518d\u9700\u8981\u7684\u65f6\u5019\uff0c\u4e5f\u53ef\u4ee5\u901a\u8fc7 `removingEventListener` \u53d6\u6d88\u4e8b\u4ef6\u76d1\u542c\u3002
+`globalEvent` \u7528\u4e8e\u76d1\u542c\u6301\u4e45\u6027\u4e8b\u4ef6\uff0c\u4f8b\u5982\u5b9a\u4f4d\u4fe1\u606f\uff0c\u9640\u87ba\u4eea\u7b49\u7684\u53d8\u5316\u3002\u5168\u5c40\u4e8b\u4ef6\u662f\u9700\u8981\u989d\u5916 APIs \u5904\u7406\u7684\u6b21\u8981 API\u3002\u4f60\u80fd\u901a\u8fc7 `addEventListener` \u6ce8\u518c\u4e8b\u4ef6\u76d1\u542c\uff0c\u5f53\u4f60\u4e0d\u518d\u9700\u8981\u7684\u65f6\u5019\uff0c\u4e5f\u53ef\u4ee5\u901a\u8fc7 `removeEventListener` \u53d6\u6d88\u4e8b\u4ef6\u76d1\u542c\u3002
*\u63d0\u9192*
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/references/components/image.md
----------------------------------------------------------------------
diff --git a/doc/source/references/components/image.md b/doc/source/references/components/image.md
index 7cf9814..aac1735 100644
--- a/doc/source/references/components/image.md
+++ b/doc/source/references/components/image.md
@@ -9,11 +9,10 @@ version: 2.1
### Summary
-`image` tag is used to render a specified picture, and it shouldn't contain any child component. You can use `img` as alias.
+`image` tag is used to render a specified picture, and it shouldn't contain any child component. `<img>` is not supported currently.
**Notes:** the styles of `width` and `height` should be specified, otherwise it won't work.
-alias: `<img>`
### Child Components
@@ -43,7 +42,7 @@ This component supports no child components.
- support `click` event. Check out [common events](../common-event.html)
- support `appear` / `disappear` event. Check out [common events](../common-event.html)
-- `load`<sup class="api-version">v0.8+</sup> event. The `load` event fires on an image has been loaded. Only Android and iOS are supported currently. [example](http://dotwe.org/25bd347da6a59603dd31ec057d2691da)
+- `load`<sup class="api-version">v0.8+</sup> event. The `load` event fires on an image has been loaded. Only Android and iOS are supported currently. [example](http://dotwe.org/vue/98ee340348d7cc3e6fbfe68dbaef1eed)
- event object
- `success` : `true` if the image was loaded successfully, otherwise `false`
- `size` : the original size of image, contains two parameters: `naturalWidth` representing the original width of image in pixels, `naturalHeight` representing the original height of image in pixels. default value. The default value for both parameters is `0`.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/references/modules/globalevent.md
----------------------------------------------------------------------
diff --git a/doc/source/references/modules/globalevent.md b/doc/source/references/modules/globalevent.md
index 66df3a2..3738976 100644
--- a/doc/source/references/modules/globalevent.md
+++ b/doc/source/references/modules/globalevent.md
@@ -12,7 +12,7 @@ version: 2.1
`globalEvent` are used to listen for persistent events, such as changes in positioning information, gyroscopes, and so on. A global event is a secondary API that requires additional APIs to work with.
-You can register events via `addEventListener`, which can be removed by `removingEventListener` when you do not need to listen for `globalEvent`.
+You can register events via `addEventListener`, which can be removed by `removeEventListener` when you do not need to listen for `globalEvent`. `globalEvent` is not supported in Vue version.
*AUCTION*
- Only instance level is not application level .
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/90344359/doc/source/v-0.10/references/modules/globalevent.md
----------------------------------------------------------------------
diff --git a/doc/source/v-0.10/references/modules/globalevent.md b/doc/source/v-0.10/references/modules/globalevent.md
index 58e275b..0db8c48 100644
--- a/doc/source/v-0.10/references/modules/globalevent.md
+++ b/doc/source/v-0.10/references/modules/globalevent.md
@@ -12,7 +12,7 @@ version: 0.10
`globalEvent` are used to listen for persistent events, such as changes in positioning information, gyroscopes, and so on. A global event is a secondary API that requires additional APIs to work with.
-You can register events via `addEventListener`, which can be removed by `removingEventListener` when you do not need to listen for `globalEvent`.
+You can register events via `addEventListener`, which can be removed by `removeEventListener` when you do not need to listen for `globalEvent`.
*AUCTION*
- Only instance level is not application level .