You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/22 01:59:34 UTC
[01/50] incubator-weex git commit: Merge branch 'dev-cell-doc' of
https://github.com/xkli/incubator-weex into dev This closes #29
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev c96296442 -> 1e46a448e
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.12-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(+)
----------------------------------------------------------------------
[50/50] incubator-weex git commit: Merge branch '0.11-dev' into
0.12-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' into 0.12-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/1e46a448
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1e46a448
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1e46a448
Branch: refs/heads/0.12-dev
Commit: 1e46a448ef3fb061ff13b5535c39b1993c797c67
Parents: c962964 ad06ecc
Author: sospartan <so...@apache.org>
Authored: Wed Mar 22 09:59:10 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Mar 22 09:59:10 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 38 +-
.../taobao/weex/ui/component/WXComponent.java | 6 +-
.../com/taobao/weex/ui/component/WXHeader.java | 5 +
.../com/taobao/weex/ui/component/WXLoading.java | 5 +
.../com/taobao/weex/ui/component/WXRefresh.java | 5 +
.../ui/component/list/BasicListComponent.java | 13 +-
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.podspec | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +-
.../Component/Recycler/WXRecyclerComponent.m | 23 ++
.../Sources/Component/WXRefreshComponent.m | 6 -
.../Sources/Component/WXSliderComponent.m | 3 +-
.../Sources/Manager/WXInvocationConfig.h | 1 -
.../Sources/Manager/WXInvocationConfig.m | 12 -
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 5 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 9 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 39 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
159 files changed, 4258 insertions(+), 865 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e46a448/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e46a448/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
[43/50] incubator-weex git commit: Merge branch
'0.11-dev-recycle-feature' of github.com:zshshr/incubator-weex into 0.11-dev
This closes #137
Posted by so...@apache.org.
Merge branch '0.11-dev-recycle-feature' of github.com:zshshr/incubator-weex into 0.11-dev
This closes #137
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08073210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08073210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08073210
Branch: refs/heads/0.12-dev
Commit: 08073210a168d65002e3c8a20e5f3b7835092aac
Parents: e5e8deb 4b29dc9
Author: sospartan <so...@apache.org>
Authored: Tue Mar 21 15:07:47 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue Mar 21 15:07:47 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 6 +++++-
.../java/com/taobao/weex/ui/component/WXHeader.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXLoading.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXRefresh.java | 5 +++++
.../weex/ui/component/list/BasicListComponent.java | 13 +------------
5 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[03/50] incubator-weex git commit: * [doc] Update GitHub link,
change from alibaba/weex to apache/weex.
Posted by so...@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.12-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>
[33/50] incubator-weex git commit: * [ios] handle error when register
graphic font
Posted by so...@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.12-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 {
[27/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[37/50] incubator-weex git commit: * [ios] fix compiler complain
Posted by so...@apache.org.
* [ios] fix compiler complain
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/29b04648
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/29b04648
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/29b04648
Branch: refs/heads/0.12-dev
Commit: 29b046483bbcd57466347839f1fe86cba0123ae4
Parents: b3aa98d
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 20 12:03:02 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 20 12:03:02 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/29b04648/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 443595a..19fe04c 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -353,7 +353,7 @@ static BOOL WXNotStat;
}
NSArray *descriptors = (__bridge_transfer NSArray *)CTFontManagerCreateFontDescriptorsFromURL(fontURL);
// length of descriptors here will be only one.
- for (NSFontDescriptor *desc in descriptors) {
+ for (UIFontDescriptor *desc in descriptors) {
font = [UIFont fontWithDescriptor:desc size:fontSize];
}
CFRelease(fontURL);
[20/50] incubator-weex git commit: Merge branch 'update-github-link'
of https://github.com/DoranYun/incubator-weex into dev This closes #71
Posted by so...@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.12-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
----------------------------------------------------------------------
[31/50] incubator-weex git commit: * [ios] public a component header
file
Posted by so...@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.12-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"
[13/50] incubator-weex git commit: Update integrate-to-your-app.md
Posted by so...@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.12-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.
[10/50] incubator-weex git commit: * [doc] Fix indicator example.
Posted by so...@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.12-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)
[44/50] incubator-weex git commit: * [ios] bug fix protect instanceId
is nil in some case.
Posted by so...@apache.org.
* [ios] bug fix protect instanceId is nil in some case.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/badf8354
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/badf8354
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/badf8354
Branch: refs/heads/0.12-dev
Commit: badf8354ef2ffca3b44964e122b3c9e0d81af4c6
Parents: e5e8deb
Author: boboning <ni...@163.com>
Authored: Tue Mar 21 17:00:56 2017 +0800
Committer: boboning <ni...@163.com>
Committed: Tue Mar 21 17:00:56 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/badf8354/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m b/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
index b6edf76..6315937 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m
@@ -159,7 +159,10 @@ WX_EXPORT_METHOD(@selector(setNavBarHidden:callback:))
UIViewController *container = self.weexInstance.viewController;
NSMutableDictionary *mutableParam = [param mutableCopy];
- [mutableParam setObject:self.weexInstance.instanceId forKey:@"instanceId"];
+
+ if (self.weexInstance.instanceId) {
+ [mutableParam setObject:self.weexInstance.instanceId forKey:@"instanceId"];
+ }
[navigator setNavigationItemWithParam:mutableParam position:position completion:^(NSString *code, NSDictionary *responseData) {
if (callback && code) {
[15/50] incubator-weex git commit: Update set-up-env.md
Posted by so...@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.12-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
---
[39/50] incubator-weex git commit: * [ios] fix refresh fold more than
refresh view height
Posted by so...@apache.org.
* [ios] fix refresh fold more than refresh view height
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c885bbf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c885bbf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c885bbf5
Branch: refs/heads/0.12-dev
Commit: c885bbf536a568531f338306a06f7d76a670cd79
Parents: bbcc2db
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 20 17:10:58 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 20 17:10:58 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c885bbf5/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
index f519a4f..d71df2d 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
@@ -142,7 +142,9 @@
offset.y = -self.calculatedFrame.size.height;
[_indicator start];
} else {
- offset.y += CGRectGetHeight(self.calculatedFrame);
+ if (fabs(offset.y) >= CGRectGetHeight(self.calculatedFrame)) {
+ offset.y += CGRectGetHeight(self.calculatedFrame);
+ }
[_indicator stop];
}
[scrollerProtocol setContentOffset:offset animated:YES];
@@ -154,10 +156,4 @@
return _displayState;
}
-- (void)setFrame:(CGRect)frame
-{
- CGRect rect = frame;
- rect.origin.y = 0 - frame.size.height;
-}
-
@end
[05/50] incubator-weex git commit: * [website] Re-ordered the guide
content: intro up & tools down.
Posted by so...@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.12-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
---
[16/50] incubator-weex git commit: Update integrate-to-your-app.md
Posted by so...@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.12-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
---
[48/50] incubator-weex git commit: * [ios] update sdk version to
0.11.0
Posted by so...@apache.org.
* [ios] update sdk version to 0.11.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f935a491
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f935a491
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f935a491
Branch: refs/heads/0.12-dev
Commit: f935a491e4e2185ae70330a6f09265c9dc3bd0d3
Parents: 928f159
Author: acton393 <zh...@gmail.com>
Authored: Tue Mar 21 19:11:27 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Mar 21 19:11:27 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f935a491/ios/sdk/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.podspec b/ios/sdk/WeexSDK.podspec
index 66af1d4..5cc5805 100644
--- a/ios/sdk/WeexSDK.podspec
+++ b/ios/sdk/WeexSDK.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
s.name = "WeexSDK"
- s.version = "0.10.0"
+ s.version = "0.11.0"
s.summary = "WeexSDK Source ."
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f935a491/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
index 6c0e3d1..5256555 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
@@ -9,7 +9,7 @@
#ifndef __WX_DEFINE_H__
#define __WX_DEFINE_H__
-#define WX_SDK_VERSION @"0.10.2"
+#define WX_SDK_VERSION @"0.11.0"
#if defined(__cplusplus)
#define WX_EXTERN extern "C" __attribute__((visibility("default")))
[29/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[06/50] incubator-weex git commit: * [website] Updated header menu
and link more tools internal.
Posted by so...@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.12-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>
[38/50] incubator-weex git commit: * [ios] fix stream response type
bug
Posted by so...@apache.org.
* [ios] fix stream response type bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bbcc2db0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bbcc2db0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bbcc2db0
Branch: refs/heads/0.12-dev
Commit: bbcc2db027630f32c609a211871bf21a0702bea0
Parents: 29b0464
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 20 16:02:21 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 20 16:02:21 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bbcc2db0/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m b/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
index c23680d..d35f7d0 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
@@ -119,7 +119,9 @@ WX_EXPORT_METHOD(@selector(fetch:callback:progressCallback:))
//parse responseType
NSString *responseType = [options objectForKey:@"type"];
- [callbackRsp setObject:responseType?:@"JSON" forKey:@"responseType"];
+ if ([responseType isKindOfClass:[NSString class]]) {
+ [callbackRsp setObject:responseType? responseType.lowercaseString:@"" forKey:@"responseType"];
+ }
//parse timeout
if ([options valueForKey:@"timeout"]){
@@ -195,8 +197,8 @@ WX_EXPORT_METHOD(@selector(fetch:callback:progressCallback:))
NSString *responseData = [self _stringfromData:data encode:((NSHTTPURLResponse*)response).textEncodingName];
NSString * responseType = [callbackRsp objectForKey:@"responseType"];
[callbackRsp removeObjectForKey:@"responseType"];
- if (responseType) {
-
+ if ([responseType isEqualToString:@"json"] || [responseType isEqualToString:@"jsonp"]) {
+ //handle json format
if ([responseType isEqualToString:@"jsonp"]) {
//TODO: to be more elegant
NSUInteger start = [responseData rangeOfString:@"("].location + 1 ;
@@ -211,6 +213,7 @@ WX_EXPORT_METHOD(@selector(fetch:callback:progressCallback:))
}
} else {
+ // return original Data
if (responseData) {
[callbackRsp setObject:responseData forKey:@"data"];
}
[21/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 so...@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.12-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
----------------------------------------------------------------------
[24/50] incubator-weex git commit: Merge branch 'dev' of
http://github.com/acton393/incubator-weex into dev This closes #94
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[11/50] incubator-weex git commit: * [website] Added contributing
page.
Posted by so...@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.12-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.
[22/50] incubator-weex git commit: Merge branch 'doc-fix-typo' of
https://github.com/DoranYun/incubator-weex into dev This closes #86
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[35/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[28/50] incubator-weex git commit: * [ios] remove unused function
Posted by so...@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.12-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
[12/50] incubator-weex git commit: * [website] Updated contributing.md
Posted by so...@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.12-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
[41/50] incubator-weex git commit: * [android] some special component
set no recycle
Posted by so...@apache.org.
* [android] some special component set no recycle
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4b29dc9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4b29dc9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4b29dc9b
Branch: refs/heads/0.12-dev
Commit: 4b29dc9bea5a4d7baed72b6376a27d2fbc46b1db
Parents: bbcc2db
Author: zshshr <zh...@gmail.com>
Authored: Tue Mar 21 11:50:34 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Mar 21 11:50:34 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 6 +++++-
.../java/com/taobao/weex/ui/component/WXHeader.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXLoading.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXRefresh.java | 5 +++++
.../weex/ui/component/list/BasicListComponent.java | 13 +------------
5 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4b29dc9b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 08a6cb8..8785064 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1094,6 +1094,10 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
return mDomObj.getStyles().isSticky();
}
+ public boolean isFixed() {
+ return mDomObj.getStyles().isFixed();
+ }
+
public void setDisabled(boolean disabled) {
mIsDisabled = disabled;
if (mHost == null) {
@@ -1498,7 +1502,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
public boolean canRecycled(){
- return mDomObj.getAttrs().canRecycled();
+ return (!isFixed() || !isSticky()) && mDomObj.getAttrs().canRecycled();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4b29dc9b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
index 010dd5a..289688f 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java
@@ -237,4 +237,9 @@ public class WXHeader extends WXCell {
public boolean isSticky() {
return true;
}
+
+ @Override
+ public boolean canRecycled() {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4b29dc9b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
index a83d95f..abc3b09 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
@@ -261,6 +261,11 @@ public class WXLoading extends WXBaseRefresh implements WXSwipeLayout.WXOnLoadin
}
@Override
+ public boolean canRecycled() {
+ return false;
+ }
+
+ @Override
protected boolean setProperty(String key, Object param) {
switch (key) {
case Constants.Name.DISPLAY:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4b29dc9b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java
index 9ca6b3c..94b0aed 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java
@@ -246,6 +246,11 @@ public class WXRefresh extends WXBaseRefresh implements WXSwipeLayout.WXOnRefres
}
@Override
+ public boolean canRecycled() {
+ return false;
+ }
+
+ @Override
public void onRefresh() {
if(isDestoryed()){
return;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4b29dc9b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 5af9075..f0717ce 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -913,21 +913,10 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
@Override
public void onViewRecycled(ListBaseViewHolder holder) {
long begin = System.currentTimeMillis();
- WXComponent component = holder.getComponent();
- if (component == null
- || (component instanceof WXRefresh)
- || (component instanceof WXLoading)
- || (component.getDomObject() != null && component.getDomObject().isFixed())
- ) {
- if (WXEnvironment.isApkDebugable()) {
- WXLogUtils.d(TAG, "Bind WXRefresh & WXLoading " + holder);
- }
- return;
- }
- holder.setComponentUsing(false);
if(holder.canRecycled()) {
recycleViewList.add(holder);
+ holder.setComponentUsing(false);
} else {
WXLogUtils.w(TAG, "this holder can not be allowed to recycled" );
}
[26/50] incubator-weex git commit: * [site] Update market link.
Posted by so...@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.12-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>
[34/50] incubator-weex git commit: * [ios] bug fix slider can not
scroll to special area.
Posted by so...@apache.org.
* [ios] bug fix slider can not scroll to special area.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9cd4dae2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9cd4dae2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9cd4dae2
Branch: refs/heads/0.12-dev
Commit: 9cd4dae2bab0436fb7a57c854bc8a2cce2352c57
Parents: c6c6399
Author: boboning <ni...@163.com>
Authored: Sat Mar 18 10:41:11 2017 +0800
Committer: boboning <ni...@163.com>
Committed: Sat Mar 18 10:41:11 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9cd4dae2/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
index 1df3aa2..c09654b 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
@@ -238,7 +238,8 @@
{
if (self.itemViews.count > 2) {
UIView *itemView = [self.itemViews objectAtIndex:[self _centerItemIndex]];
- [self.scrollView scrollRectToVisible:itemView.frame animated:NO];
+ //[self.scrollView scrollRectToVisible:itemView.frame animated:NO];
+ [self.scrollView setContentOffset:CGPointMake(itemView.frame.origin.x, itemView.frame.origin.y) animated:NO];
}
}
[42/50] incubator-weex git commit: + [ios] remove WXVlidateProtocol.h
to Public
Posted by so...@apache.org.
+ [ios] remove WXVlidateProtocol.h to Public
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e5e8deba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e5e8deba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e5e8deba
Branch: refs/heads/0.12-dev
Commit: e5e8deba0328c780081eeba00501d0d28813a349
Parents: bbcc2db
Author: \u516e\u74dc <xi...@alibaba-inc.com>
Authored: Tue Mar 21 13:56:18 2017 +0800
Committer: \u516e\u74dc <xi...@alibaba-inc.com>
Committed: Tue Mar 21 13:56:18 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/e5e8deba/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index e0b84fb..f861bd9 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
- 042013AD1E66CD6A001FC79C /* WXValidateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 042013AC1E66CD6A001FC79C /* WXValidateProtocol.h */; };
+ 042013AD1E66CD6A001FC79C /* WXValidateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 042013AC1E66CD6A001FC79C /* WXValidateProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
1C1A2BED1D91172800539AA1 /* WXConvertTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1A2BEC1D91172800539AA1 /* WXConvertTests.m */; };
1D3000F11D40B9AC004F3B4F /* WXClipboardModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D3000EF1D40B9AB004F3B4F /* WXClipboardModule.h */; };
1D3000F21D40B9AC004F3B4F /* WXClipboardModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3000F01D40B9AB004F3B4F /* WXClipboardModule.m */; };
[46/50] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/acton393/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex 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/b7dabe65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7dabe65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7dabe65
Branch: refs/heads/0.12-dev
Commit: b7dabe658d4a398cb571c6531737916f6c5721bd
Parents: badf835 928f159
Author: cxfeng <cx...@apache.org>
Authored: Tue Mar 21 19:02:15 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Tue Mar 21 19:02:15 2017 +0800
----------------------------------------------------------------------
.../Component/Recycler/WXRecyclerComponent.m | 23 ++++++++++++++++++++
.../Sources/Component/WXRefreshComponent.m | 6 -----
2 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[25/50] incubator-weex git commit: * [doc] Update cnzz id.
Posted by so...@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.12-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>
[09/50] incubator-weex git commit: * [doc] Update some examples.
Posted by so...@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.12-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 .
[30/50] incubator-weex git commit: * [ios] public WXAcomponent.h
Posted by so...@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.12-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 */; };
[14/50] incubator-weex git commit: Update set-up-env.md
Posted by so...@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.12-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
---
[45/50] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/cff34295
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cff34295
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cff34295
Branch: refs/heads/0.12-dev
Commit: cff34295d31baf02b6faa0c7c4cd0e36844f0149
Parents: 0807321 badf835
Author: sospartan <so...@apache.org>
Authored: Tue Mar 21 18:15:37 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue Mar 21 18:15:37 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.m | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[40/50] incubator-weex git commit: * [ios] fix contentOffset reset
Posted by so...@apache.org.
* [ios] fix contentOffset reset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/928f1592
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/928f1592
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/928f1592
Branch: refs/heads/0.12-dev
Commit: 928f1592aa728f3fd254830b1821b027ae81086a
Parents: c885bbf
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 20 17:59:17 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 20 17:59:17 2017 +0800
----------------------------------------------------------------------
.../Component/Recycler/WXRecyclerComponent.m | 23 ++++++++++++++++++++
.../Sources/Component/WXRefreshComponent.m | 4 +---
2 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/928f1592/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
index 4789291..073e878 100644
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
@@ -105,6 +105,7 @@ typedef enum : NSUInteger {
_dataController = [WXRecyclerDataController new];
_updateController = [WXRecyclerUpdateController new];
_updateController.delegate = self;
+ [self fixFlicker];
}
return self;
@@ -581,4 +582,26 @@ typedef enum : NSUInteger {
return sectionArray;
}
+- (void)fixFlicker
+{
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ // FIXME:(\u0e07 \u2022\u0300_\u2022\u0301)\u0e07\u253b\u2501\u253b Stupid scoll view, always reset content offset to zero by calling _adjustContentOffsetIfNecessary after insert cells.
+ // So if you pull down list while list is rendering, the list will be flickering.
+ // Demo:
+ // Have to hook _adjustContentOffsetIfNecessary here.
+ // Any other more elegant way?
+ NSString *a = @"ntOffsetIfNe";
+ NSString *b = @"adjustConte";
+
+ NSString *originSelector = [NSString stringWithFormat:@"_%@%@cessary", b, a];
+ [[self class] weex_swizzle:[WXCollectionView class] Method:NSSelectorFromString(originSelector) withMethod:@selector(fixedFlickerSelector)];
+ });
+}
+
+- (void)fixedFlickerSelector
+{
+ // DO NOT delete this method.
+}
+
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/928f1592/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
index d71df2d..ab790dc 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
@@ -142,9 +142,7 @@
offset.y = -self.calculatedFrame.size.height;
[_indicator start];
} else {
- if (fabs(offset.y) >= CGRectGetHeight(self.calculatedFrame)) {
- offset.y += CGRectGetHeight(self.calculatedFrame);
- }
+ offset.y += CGRectGetHeight(self.calculatedFrame);
[_indicator stop];
}
[scrollerProtocol setContentOffset:offset animated:YES];
[47/50] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/3bc99781
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3bc99781
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3bc99781
Branch: refs/heads/0.12-dev
Commit: 3bc997813e988d39176b85cee9cd534dcf6321c3
Parents: b7dabe6 cff3429
Author: cxfeng <cx...@apache.org>
Authored: Tue Mar 21 19:02:35 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Tue Mar 21 19:02:35 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 6 +++++-
.../java/com/taobao/weex/ui/component/WXHeader.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXLoading.java | 5 +++++
.../java/com/taobao/weex/ui/component/WXRefresh.java | 5 +++++
.../weex/ui/component/list/BasicListComponent.java | 13 +------------
5 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[04/50] incubator-weex git commit: Fix some grammatical issues on the
English webpage
Posted by so...@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.12-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
[19/50] incubator-weex git commit: * [website] Fixed the order of
docs.
Posted by so...@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.12-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
---
[32/50] incubator-weex git commit: * [ios] draw iconfont use coreText
Posted by so...@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.12-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}];
}
[08/50] incubator-weex git commit: * [ios] remove dlsym for jscore
garbage Collection
Posted by so...@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.12-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
[23/50] incubator-weex git commit: * [ios] bugfix incorrect code
Posted by so...@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.12-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
[02/50] incubator-weex git commit: Merge branch 'feature-tools-doc'
of https://github.com/DoranYun/incubator-weex into dev This closes #54
Posted by so...@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.12-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
----------------------------------------------------------------------
[36/50] incubator-weex git commit: Merge remote-tracking branch
'upstream/dev' into 0.11-dev
Posted by so...@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.12-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}];
}
[17/50] incubator-weex git commit: Merge branch
'website-feature-contributing' of http://github.com/Jinjiang/incubator-weex
into dev This closes #88
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[07/50] incubator-weex git commit: * [ios] fix default handler
override
Posted by so...@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.12-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
[18/50] incubator-weex git commit: Merge branch
'website-feature-menu' of http://github.com/Jinjiang/incubator-weex into dev
This closes #90
Posted by so...@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.12-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(-)
----------------------------------------------------------------------
[49/50] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/acton393/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex 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/ad06eccc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ad06eccc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ad06eccc
Branch: refs/heads/0.12-dev
Commit: ad06ecccc15ec449c59a4df61746af808d0d5674
Parents: 3bc9978 f935a49
Author: cxfeng <cx...@apache.org>
Authored: Tue Mar 21 19:14:39 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Tue Mar 21 19:14:39 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------