You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/07/26 07:27:45 UTC
[1/3] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.16-dev' into 0.16-dev
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev e4e181922 -> e01d0e7c4
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/74359975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/74359975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/74359975
Branch: refs/heads/0.16-dev
Commit: 74359975cce9cbba1e39906453be85870a98cfb2
Parents: b1ced32 3afacf1
Author: yinfeng <cx...@apache.org>
Authored: Wed Jul 26 15:09:52 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Wed Jul 26 15:09:52 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 6 +-
dangerfile.js | 8 +-
doc/_config.yml | 6 +-
doc/_config_cn.yml | 6 +-
doc/source/_posts/coreml.md | 79 ++++++++++++++
doc/source/_posts/hello_world.md | 3 +-
doc/source/_posts/test.md | 14 +++
.../cn/references/advanced/extend-to-android.md | 15 ++-
doc/source/cn/references/bubble.md | 4 +-
doc/source/cn/references/common-style.md | 4 +-
doc/source/cn/references/components/image.md | 2 +-
doc/source/cn/references/components/input.md | 34 +++---
doc/source/cn/references/components/list.md | 8 +-
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/cn/references/weex-variable.md | 2 +-
doc/source/cn/v-0.10/references/bubble.md | 6 +-
doc/source/guide/intro/write-once.md | 14 +--
doc/source/guide/set-up-env.md | 22 ++--
.../references/advanced/extend-to-android.md | 14 +++
doc/source/references/bubble.md | 4 +-
doc/source/references/components/image.md | 2 +-
doc/source/references/components/input.md | 34 +++---
doc/source/references/components/list.md | 7 +-
doc/source/references/components/scroller.md | 4 +-
doc/source/v-0.10/references/bubble.md | 8 +-
doc/themes/weex/languages/cn.yml | 5 +-
doc/themes/weex/languages/en.yml | 3 +-
doc/themes/weex/layout/_partial/footer.ejs | 2 +-
doc/themes/weex/layout/_partial/header.ejs | 23 ++--
.../weex/layout/_partial/post/summary.ejs | 6 +
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/layout.ejs | 6 +-
doc/themes/weex/source/css/index.scss | 2 +
doc/themes/weex/source/css/partial/footer.scss | 5 +-
doc/themes/weex/source/css/partial/summary.scss | 6 +
doc/themes/weex/source/js/common.js | 38 +++++++
html5/test/render/vue/core/node.js | 5 +-
.../render/vue/data/dotvue/event-bubble-bar.vue | 8 +-
.../render/vue/data/dotvue/event-bubble.vue | 4 +-
html5/test/render/vue/modules/animation.js | 61 +++++++++++
html5/test/render/vue/modules/dom.js | 109 +++++++++++++++++++
html5/test/render/vue/modules/globalEvent.js | 45 ++++++++
html5/test/render/vue/modules/navigator.js | 44 ++++++++
html5/test/render/vue/modules/webview.js | 53 +++++++++
44 files changed, 618 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: * [ios] fix keep-scroll-position
crash, demo: http://dotwe.org/vue/62c15f7750d600aa5a184a3ca77c1e13
Posted by ac...@apache.org.
* [ios] fix keep-scroll-position crash, demo: http://dotwe.org/vue/62c15f7750d600aa5a184a3ca77c1e13
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a1819d50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a1819d50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a1819d50
Branch: refs/heads/0.16-dev
Commit: a1819d506ba6d79b5bd3738836e5c360fe7edbee
Parents: 7435997
Author: yinfeng <cx...@apache.org>
Authored: Wed Jul 26 15:10:35 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Wed Jul 26 15:10:35 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a1819d50/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index f995c3e..47ee192 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -608,7 +608,7 @@
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
- WXHeaderComponent *header = ((WXSection *)_completedSections[section]).header;
+ WXHeaderComponent *header = ((WXSection *)[_completedSections wx_safeObjectAtIndex:section]).header;
if (header) {
return header.calculatedFrame.size.height;
} else {
[3/3] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.16-dev' into 0.16-dev
Posted by ac...@apache.org.
Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-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/e01d0e7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e01d0e7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e01d0e7c
Branch: refs/heads/0.16-dev
Commit: e01d0e7c473f13150049bb947021e625be1090a3
Parents: a1819d5 e4e1819
Author: yinfeng <cx...@apache.org>
Authored: Wed Jul 26 15:14:38 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Wed Jul 26 15:14:38 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo/WXDemoViewController.m | 1 -
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 22 ++++++++++++++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 +++++++++++++
.../Sources/Manager/WXComponentManager.m | 1 +
.../WeexSDK/Sources/Manager/WXTracingManager.h | 15 ++++++-------
.../WeexSDK/Sources/Manager/WXTracingManager.m | 18 +++++++++-------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 ++--
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +++++
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 9 +++++++-
9 files changed, 70 insertions(+), 19 deletions(-)
----------------------------------------------------------------------