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/05/12 09:50:56 UTC
[05/11] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.13-dev' into 0.13-dev
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/7e8ccb31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7e8ccb31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7e8ccb31
Branch: refs/heads/0.13-dev
Commit: 7e8ccb317c3a19aec172bca4563df05e690f71fb
Parents: e7ee7b8 a5f96cf
Author: yinfeng <cx...@apache.org>
Authored: Fri May 12 15:24:24 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Fri May 12 15:24:24 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/dom/action/AnimationAction.java | 3 +
.../ui/animation/DimensionUpdateListener.java | 14 ++
.../weex/ui/animation/WXAnimationBean.java | 1 +
.../taobao/weex/ui/component/WXComponent.java | 37 +++++
.../ui/component/list/BasicListComponent.java | 8 +-
doc/source/cn/references/bubble.md | 146 ++++++++++++++++++
doc/source/cn/references/downgrade.md | 11 ++
doc/source/cn/references/index.md | 4 +-
doc/source/cn/v-0.10/references/bubble.md | 150 +++++++++++++++++++
doc/source/references/bubble.md | 146 ++++++++++++++++++
doc/source/references/downgrade.md | 11 ++
doc/source/references/index.md | 2 +
doc/source/v-0.10/references/bubble.md | 150 +++++++++++++++++++
examples/vue/market/gcanvas.vue | 2 +-
html5/runtime/vdom/document.js | 4 +-
html5/runtime/vdom/element.js | 25 +++-
html5/test/unit/default/vm/vm.js | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 +
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 13 +-
.../Sources/Component/WXCycleSliderComponent.m | 5 +-
.../Sources/Component/WXEmbedComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 21 +++
.../Component/WXSliderNeighborComponent.m | 9 +-
.../Sources/Controller/WXBaseViewController.m | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 1 +
.../WeexSDK/Sources/Events/WXComponent+Events.m | 19 ++-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 17 ++-
.../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 ++++++
.../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 ++++++++++++++
.../WeexSDK/Sources/Module/WXAnimationModule.m | 30 +++-
.../WeexSDK/Sources/Module/WXModalUIModule.m | 1 +
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
package.json | 4 +-
33 files changed, 985 insertions(+), 28 deletions(-)
----------------------------------------------------------------------