Merge commit 'a2912db882c36d768b8ac8ae28b2d1ffa5755215' into 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/23c4a026 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/23c4a026 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/23c4a026 Branch: refs/heads/0.16-dev Commit: 23c4a0264ffdde8d3fce613c7be3e577c7da57bf Parents: 5747390 a2912db Author: gurisxie <279483...@qq.com> Authored: Fri Sep 1 15:03:59 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Fri Sep 1 15:03:59 2017 +0800 ---------------------------------------------------------------------- .../weex/ui/component/list/WXListComponent.java | 37 ++++++++++---------- ios/playground/WeexDemo/Scanner/WXScannerVC.m | 2 +- .../WeexSDK/Sources/Component/WXEditComponent.m | 5 --- .../Sources/Component/WXImageComponent.m | 3 ++ ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
