You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/04/27 06:56:17 UTC
[13/13] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-dev
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-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/6b951cbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6b951cbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6b951cbf
Branch: refs/heads/0.13-dev
Commit: 6b951cbfc6ef2b30473da00049ab26a83dc41935
Parents: 507cd7c eb7ec0d
Author: acton393 <zh...@gmail.com>
Authored: Thu Apr 27 14:55:10 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Apr 27 14:55:10 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7815820 -> 7652256 bytes
.../taobao/weex/dom/WXRecyclerDomObject.java | 8 +-
.../weex/dom/action/GetComponentRectAction.java | 29 +-
.../taobao/weex/ui/component/WXScroller.java | 16 +-
.../java/com/taobao/weex/utils/WXUtils.java | 3 +
package.json | 1 +
test/pages/attributes/compositing.vue | 89 ++++++
test/pages/css/border.vue | 283 +++++++++++++++++++
test/screenshot/border-ios.png | Bin 0 -> 168396 bytes
test/screenshot/compositing-ios.png | Bin 0 -> 228661 bytes
test/scripts/attributes/compositing.test.js | 63 +++++
test/scripts/css/border.test.js | 63 +++++
test/scripts/util.js | 33 +++
13 files changed, 567 insertions(+), 21 deletions(-)
----------------------------------------------------------------------