You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/13 02:19:10 UTC
[5/6] incubator-weex git commit: Merge branch '0.12-dev' into
0.12-dev-feature-jsfm0.20.3
Merge branch '0.12-dev' into 0.12-dev-feature-jsfm0.20.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3ea37642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3ea37642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3ea37642
Branch: refs/heads/0.12-dev
Commit: 3ea37642800bdbe87f0e011244e8508248c39de8
Parents: 3fb44b0 b92bf6f
Author: atomtong <to...@qq.com>
Authored: Wed Apr 12 16:24:27 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Wed Apr 12 16:24:27 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXSDKEngine.java | 3 +
.../java/com/taobao/weex/WXSDKInstance.java | 25 +++++
.../com/taobao/weex/dom/WXCellDomObject.java | 57 ++++++++++
.../taobao/weex/dom/WXRecyclerDomObject.java | 29 +++--
.../taobao/weex/dom/action/AnimationAction.java | 3 +-
.../taobao/weex/ui/component/WXComponent.java | 16 ++-
.../com/taobao/weex/ui/component/WXDiv.java | 4 +-
.../com/taobao/weex/ui/view/IRenderResult.java | 26 +++++
.../com/taobao/weex/ui/view/WXFrameLayout.java | 19 +++-
.../com/taobao/weex/ui/view/WXImageView.java | 9 +-
.../com/taobao/weex/ui/view/WXTextView.java | 9 +-
.../com/taobao/weex/utils/WXResourceUtils.java | 105 +++++++++----------
.../taobao/weex/ui/component/WXTextTest.java | 5 +-
.../taobao/weex/utils/WXResourceUtilsTest.java | 13 +--
dangerfile.js | 11 +-
doc/source/cn/references/modules/modal.md | 2 +
doc/source/references/modules/modal.md | 2 +
html5/render/browser/base/component/lazyload.js | 1 -
html5/render/browser/extend/api/webSocket.js | 1 -
.../browser/extend/components/image/index.js | 1 -
.../extend/components/scrollable/motion.js | 1 -
.../extend/components/scrollable/scrollable.js | 1 -
html5/render/browser/utils/index.js | 1 -
.../Sources/Component/WXImageComponent.m | 6 +-
.../Sources/Display/WXComponent+Display.m | 2 +-
package.json | 2 +-
test/ci-funcs.sh | 1 +
test/pages/components/recycler.vue | 19 +++-
test/pages/slider-infinite.vue | 11 +-
test/scripts/components/recycler.test.js | 56 ++++------
test/scripts/components/slider-infinite.test.js | 15 +--
31 files changed, 296 insertions(+), 160 deletions(-)
----------------------------------------------------------------------