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/09/01 07:24:03 UTC

[20/25] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-dev

Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-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/13e40fb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/13e40fb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/13e40fb3

Branch: refs/heads/0.16-dev
Commit: 13e40fb3069afe5f3af5d9d9721f1e0707ba36e5
Parents: a40ed2d 1b65448
Author: acton393 <zh...@gmail.com>
Authored: Wed Aug 30 11:30:05 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Aug 30 11:30:05 2017 +0800

----------------------------------------------------------------------
 .../commons/adapter/FrescoImageComponent.java   |  2 +-
 .../com/taobao/weex/ui/component/WXImage.java   | 75 ++++++++++----------
 .../com/taobao/weex/ui/component/WXText.java    | 25 ++++---
 .../taobao/weex/ui/component/WXVContainer.java  |  6 ++
 .../com/taobao/weex/ui/view/WXImageView.java    | 16 +----
 .../com/taobao/weex/utils/ImageDrawable.java    | 17 +++--
 .../Sources/Manager/WXComponentManager.h        |  8 +++
 .../Sources/Manager/WXComponentManager.m        | 19 +++++
 8 files changed, 104 insertions(+), 64 deletions(-)
----------------------------------------------------------------------