Merge branch '0.12-dev' 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/06b444b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/06b444b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/06b444b8 Branch: refs/heads/0.12-dev Commit: 06b444b8642214d4177a3ccc06f12985ffa1b995 Parents: a68dab1 93c5329 Author: MrRaindrop <tekk...@gmail.com> Authored: Fri Apr 14 13:56:01 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Fri Apr 14 13:56:01 2017 +0800 ---------------------------------------------------------------------- android/sdk/assets/main.js | 16 +- android/sdk/libs/armeabi/libweexv8.so | Bin 3563544 -> 3563544 bytes android/sdk/libs/x86/libweexv8.so | Bin 4545544 -> 4545544 bytes .../java/com/taobao/weex/WXSDKInstance.java | 2 +- .../taobao/weex/ui/component/WXComponent.java | 7 +- .../java/com/taobao/weex/WXSDKInstanceTest.java | 1 - dangerfile.js | 7 +- 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 +- 15 files changed, 366 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/06b444b8/package.json ---------------------------------------------------------------------- diff --cc package.json index 6f2002a,53f65d8..04285af --- a/package.json +++ b/package.json @@@ -3,8 -3,8 +3,8 @@@ "version": "0.4.0", "subversion": { "browser": "0.5.0", - "framework": "0.20.3", + "framework": "0.20.4", - "vue-render": "0.11.5", + "vue-render": "0.11.6", "transformer": ">=0.1.5 <0.5" }, "description": "A framework for building Mobile cross-platform UI",