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/04/24 03:51:23 UTC
[49/50] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of
https://github.com/apache/incubator-weex into 0.12-dev-web
Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into 0.12-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/5e56f383
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5e56f383
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5e56f383
Branch: refs/heads/0.12-dev
Commit: 5e56f383c2ce40de57834809bac0c8fc76073c1e
Parents: 62c0efb 9381c91
Author: MrRaindrop <te...@gmail.com>
Authored: Fri Apr 21 12:16:36 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Fri Apr 21 12:16:36 2017 +0800
----------------------------------------------------------------------
README.md | 2 +-
WeexSDK.podspec | 2 +-
.../java/com/alibaba/weex/WXPageActivity.java | 6 -
android/sdk/build.gradle | 2 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 0 -> 7816288 bytes
android/sdk/libs/armeabi/libweexv8.so | Bin 3563544 -> 0 bytes
.../main/java/com/taobao/weex/WXSDKEngine.java | 2 +-
.../java/com/taobao/weex/bridge/WXParams.java | 6 +
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 4 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 13 +-
.../WeexSDK/Sources/Component/WXTextComponent.h | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 267 +++++++++++++++----
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 +
.../Sources/View/WXComponent+ViewManagement.m | 4 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 32 +--
ios/sdk/buildScripts.sh | 25 +-
package.json | 4 +-
test/pages/components/text-layout.vue | 30 +++
test/scripts/components/recycler.test.js | 19 +-
test/scripts/components/text.test.js | 131 +++++++++
test/serve.sh | 2 +-
23 files changed, 447 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5e56f383/package.json
----------------------------------------------------------------------