You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/06 11:10:09 UTC
[03/12] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
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/917013e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/917013e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/917013e2
Branch: refs/heads/0.11-dev
Commit: 917013e25a5c6a6090897e3acd57e07b7c7a5caa
Parents: d4c9a0b 3621001
Author: \u9690\u98ce <cx...@gmail.com>
Authored: Mon Mar 6 10:45:38 2017 +0800
Committer: \u9690\u98ce <cx...@gmail.com>
Committed: Mon Mar 6 10:45:38 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/WXComponent.java | 2 +
.../com/taobao/weex/ui/component/WXImage.java | 29 ++-
.../com/taobao/weex/ui/component/WXSlider.java | 20 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 ++
.../ui/component/list/BasicListComponent.java | 31 +--
.../com/taobao/weex/ui/view/WXImageView.java | 20 +-
.../weex/ui/view/border/BorderDrawable.java | 1 -
.../taobao/weex/ui/view/border/BorderEdge.java | 71 +++---
.../listview/adapter/ListBaseViewHolder.java | 37 +++-
.../ui/view/refresh/wrapper/BaseBounceView.java | 6 +-
examples/module/websocket-demo.we | 222 ++++++++++---------
ios/playground/WeexDemo/WXDemoViewController.m | 4 -
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 12 +
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 8 +-
.../WeexSDK/Sources/Component/WXEditComponent.h | 2 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 76 ++++++-
.../Sources/Component/WXScrollerComponent.m | 2 +-
.../Sources/Component/WXTextInputComponent.h | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 6 -
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 4 +
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 4 +-
.../Sources/Protocol/WXJSExceptionProtocol.h | 21 ++
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 53 ++---
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
test/pages/image-onload.we | 19 ++
test/scripts/components/image-onload.test.js | 39 ++++
29 files changed, 481 insertions(+), 234 deletions(-)
----------------------------------------------------------------------