Merge remote-tracking branch 'upstream/0.13-dev' into 0.13-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/f9df145f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f9df145f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f9df145f Branch: refs/heads/0.13-dev Commit: f9df145f003b32f36a142d1ed18a532fbb782541 Parents: 6ddff9f 9e93fc6 Author: acton393 <zhangxing610...@gmail.com> Authored: Wed May 3 14:19:59 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Wed May 3 14:19:59 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 7 + .../java/com/alibaba/weex/WXPageActivity.java | 3 +- android/run-ci.sh | 2 +- android/sdk/libs/armeabi/libweexjsc.so | Bin 7815820 -> 7652256 bytes .../java/com/taobao/weex/WXSDKInstance.java | 5 + .../com/taobao/weex/dom/TextDecorationSpan.java | 55 ++++++ .../java/com/taobao/weex/dom/WXDomObject.java | 51 ++--- .../taobao/weex/dom/WXRecyclerDomObject.java | 8 +- .../main/java/com/taobao/weex/dom/WXStyle.java | 193 +++++++++++++++++-- .../com/taobao/weex/dom/WXTextDomObject.java | 11 +- .../weex/dom/action/GetComponentRectAction.java | 29 +-- .../taobao/weex/ui/component/WXScroller.java | 16 +- .../weex/ui/component/WXTextDecoration.java | 1 + .../java/com/taobao/weex/utils/WXUtils.java | 60 +++++- .../java/com/taobao/weex/utils/WXUtilsTest.java | 16 +- dangerfile-junit.js | 80 ++++++++ dangerfile.js | 4 +- .../WeexDemo/Scanner/WXScannerHistoryVC.m | 25 ++- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +- .../Sources/Component/WXImageComponent.m | 13 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 29 ++- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 1 + package.json | 10 +- test/pages/components/hyperlink.vue | 31 +++ test/pages/components/hyperlink_target.vue | 22 +++ test/pages/modules/vue_timer.vue | 75 +++++++ test/pages/modules/we_timer.we | 73 +++++++ test/scripts/components/hyperlink.test.js | 44 +++++ test/scripts/components/text.test.js | 2 +- test/scripts/modules/timer.test.js | 100 ++++++++++ 30 files changed, 853 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9df145f/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m ----------------------------------------------------------------------
