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/04/17 05:49:35 UTC
[31/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/0af53acb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0af53acb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0af53acb
Branch: refs/heads/dev
Commit: 0af53acb429704a6fb0c06eeed32db08b43ed5eb
Parents: 513369b 4c30a1d
Author: sospartan <so...@apache.org>
Authored: Fri Apr 14 10:33:54 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Apr 14 10:33:54 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 16 +-
android/sdk/libs/armeabi/libweexv8.so | Bin 3571752 -> 3563544 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4566088 -> 4545544 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 8 -
.../java/com/taobao/weex/bridge/WXBridge.java | 8 -
.../com/taobao/weex/bridge/WXBridgeManager.java | 8 +-
.../java/com/taobao/weex/common/IWXBridge.java | 2 -
.../taobao/weex/bridge/WXWebsocketBridge.java | 3 -
html5/frameworks/legacy/app/ctrl/init.js | 42 +--
ios/sdk/WeexSDK/Resources/main.js | 16 +-
.../WeexSDK/Sources/Component/WXTextComponent.h | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 307 +++++++++++++++++--
.../Sources/Display/WXComponent+Display.m | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 2 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 55 +++-
package.json | 4 +-
16 files changed, 356 insertions(+), 118 deletions(-)
----------------------------------------------------------------------