You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/04/11 03:15:05 UTC
[03/10] incubator-weex git commit: Merge branch 'dev' into dev
Merge branch 'dev' 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/24ef56ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24ef56ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24ef56ad
Branch: refs/heads/dev
Commit: 24ef56adce081d606b7becd8c9d0a28eb85e8568
Parents: a04dd25 0d441c0
Author: \u9f50\u5c71 <su...@163.com>
Authored: Thu Mar 30 10:16:14 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Mar 30 10:16:14 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 38 ++-
doc/_config.yml | 9 +-
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/write-once.md | 2 +-
doc/source/cn/guide/set-up-env.md | 128 ++++++++
doc/source/cn/guide/tools/index.md | 10 +
doc/source/cn/guide/tools/toolkit.md | 231 ++++++++++++++
.../cn/references/advanced/extend-to-ios.md | 299 +++++++++++--------
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 | 2 +-
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 | 11 +-
doc/source/cn/references/gesture.md | 3 +-
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/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 | 81 +++--
doc/source/cn/references/modules/webview.md | 11 +-
doc/source/cn/references/path.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 | 82 ++---
doc/source/guide/integrate-to-your-app.md | 6 +-
doc/source/guide/intro/devtools.md | 100 -------
doc/source/guide/set-up-env.md | 93 ++++++
doc/source/guide/tools/index.md | 10 +
doc/source/guide/tools/toolkit.md | 198 ++++++++++++
doc/source/references/advanced/extend-to-ios.md | 64 ++--
doc/source/references/common-style.md | 16 +-
doc/source/references/components/a.md | 2 +-
doc/source/references/components/cell.md | 2 +
doc/source/references/components/div.md | 2 +-
doc/source/references/components/image.md | 7 +-
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 | 6 +-
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 | 13 +-
doc/source/references/gesture.md | 2 +-
doc/source/references/modules/animation.md | 2 +-
doc/source/references/modules/clipboard.md | 2 +-
doc/source/references/modules/dom.md | 6 +-
doc/source/references/modules/globalevent.md | 2 +-
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 | 97 +++---
doc/source/references/modules/webview.md | 11 +-
.../references/vue/difference-with-web.md | 2 +-
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 +-
doc/source/v-0.10/references/components/list.md | 11 +-
.../references/components/refresh-loading.md | 13 +-
.../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 | 2 +-
doc/themes/weex/layout/_partial/head.ejs | 43 ---
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/layout/playground.ejs | 2 +-
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 +-
examples/module/websocket-demo.we | 88 +++---
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 18 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 9 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 16 +-
119 files changed, 1667 insertions(+), 1017 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24ef56ad/doc/source/cn/references/common-style.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24ef56ad/doc/source/cn/references/components/input.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24ef56ad/doc/source/cn/references/modules/dom.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24ef56ad/doc/source/references/common-style.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24ef56ad/doc/source/references/components/input.md
----------------------------------------------------------------------
diff --cc doc/source/references/components/input.md
index 6542d59,837c867..10dde21
--- a/doc/source/references/components/input.md
+++ b/doc/source/references/components/input.md
@@@ -168,4 -151,4 +168,4 @@@ does not support the common-event�'cli
</style>
```
- [try it](../../examples/input.html)
-[try it](http://dotwe.org/vue/c1b1a5fdcf0937df1d847f8812a7ccb2)
++[try it](http://dotwe.org/vue/c1b1a5fdcf0937df1d847f8812a7ccb2)
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/24ef56ad/doc/source/references/modules/dom.md
----------------------------------------------------------------------
diff --cc doc/source/references/modules/dom.md
index 33cc4d2,cd5651e..77fefcf
--- a/doc/source/references/modules/dom.md
+++ b/doc/source/references/modules/dom.md
@@@ -202,4 -201,4 +202,6 @@@ Example Useage
</style>
```
- [try it](../../examples/dom-rect.html)
-[try it](http://dotwe.org/vue/87d4ed571de129ab28052b06a5d65fc8)
++
++[try it](http://dotwe.org/vue/87d4ed571de129ab28052b06a5d65fc8)
++