You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/06/21 05:27:38 UTC
[2/2] incubator-weex git commit: Merge branch '0.14-dev' into
0.14-dev-web
Merge branch '0.14-dev' into 0.14-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b6c9d0e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b6c9d0e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b6c9d0e7
Branch: refs/heads/0.14-dev
Commit: b6c9d0e77c07a3a21b9e21f698313a272752b5e1
Parents: baffd79 9994583
Author: MrRaindrop <te...@gmail.com>
Authored: Wed Jun 21 11:48:56 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Wed Jun 21 11:48:56 2017 +0800
----------------------------------------------------------------------
.travis.yml | 86 ++++-
WeexSDK.podspec | 2 +-
android/run-ci.sh | 7 -
android/sdk/build.gradle | 11 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 7566292 -> 7575352 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 4545544 -> 12130116 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 27 +-
.../java/com/taobao/weex/bridge/WXBridge.java | 299 ++++++++++++++-
.../com/taobao/weex/bridge/WXBridgeManager.java | 362 +++++++++++++++++++
.../java/com/taobao/weex/common/Constants.java | 1 +
.../java/com/taobao/weex/common/IWXBridge.java | 21 ++
.../java/com/taobao/weex/dom/WXDomModule.java | 3 +-
.../com/taobao/weex/dom/action/Actions.java | 58 ++-
.../ui/component/AbstractEditComponent.java | 33 +-
.../com/taobao/weex/ui/component/WXSlider.java | 4 +-
.../ui/component/list/BasicListComponent.java | 16 +-
.../taobao/weex/ui/module/WXTimerModule.java | 87 +++--
.../weex/ui/module/WXTimerModuleTest.java | 44 ++-
.../taobao/weex/bridge/WXWebsocketBridge.java | 88 +++++
doc/_config_cn.yml | 326 +++++++++++++++++
doc/source/cn/references/modules/picker.md | 2 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 154 ++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 111 ++++++
.../Sources/Component/WXComponent_internal.h | 1 +
.../Sources/Component/WXCycleSliderComponent.m | 7 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 7 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 16 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 8 -
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 -
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 47 ++-
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 38 ++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 4 +-
package.json | 2 +-
test/ci-funcs.sh | 18 -
test/pages/css/border.vue | 15 +-
test/run.sh | 4 +-
test/screenshot/border-ios.png | Bin 128206 -> 126375 bytes
test/scripts/util.js | 5 +-
test/serve.sh | 3 +-
39 files changed, 1736 insertions(+), 182 deletions(-)
----------------------------------------------------------------------