You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/03/30 11:39:02 UTC
[28/30] incubator-weex git commit: Merge branch '0.12-dev' into
android-feature-20170307
Merge branch '0.12-dev' into android-feature-20170307
# Conflicts:
# android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6bc2a182
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6bc2a182
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6bc2a182
Branch: refs/heads/0.12-dev
Commit: 6bc2a1826086972dfcb7a5bb78c967cfd1a290b4
Parents: 3e6f1c9 5855c68
Author: zshshr <zh...@gmail.com>
Authored: Thu Mar 30 12:11:00 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Mar 30 12:11:00 2017 +0800
----------------------------------------------------------------------
CHANGELOG.md | 7 +
.../main/java/com/taobao/weex/WXSDKEngine.java | 1 -
.../java/com/taobao/weex/WXSDKInstance.java | 6 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 72 +-
.../taobao/weex/adapter/DefaultUriAdapter.java | 8 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 3 +-
.../com/taobao/weex/dom/ApplyStyleConsumer.java | 245 ++++
.../java/com/taobao/weex/dom/DOMAction.java | 216 +++
.../com/taobao/weex/dom/DOMActionContext.java | 255 ++++
.../taobao/weex/dom/DOMActionContextImpl.java | 620 +++++++++
.../java/com/taobao/weex/dom/RenderAction.java | 215 +++
.../taobao/weex/dom/RenderActionContext.java | 218 +++
.../com/taobao/weex/dom/RenderActionTask.java | 227 ++++
.../java/com/taobao/weex/dom/WXDomHandler.java | 82 +-
.../java/com/taobao/weex/dom/WXDomManager.java | 300 +----
.../java/com/taobao/weex/dom/WXDomModule.java | 439 +-----
.../java/com/taobao/weex/dom/WXDomObject.java | 4 +-
.../com/taobao/weex/dom/WXDomStatement.java | 1272 ------------------
.../dom/action/AbstractAddElementAction.java | 313 +++++
.../dom/action/AbstractLayoutFinishAction.java | 240 ++++
.../java/com/taobao/weex/dom/action/Action.java | 212 +++
.../com/taobao/weex/dom/action/Actions.java | 350 +++++
.../weex/dom/action/AddElementAction.java | 295 ++++
.../taobao/weex/dom/action/AddEventAction.java | 262 ++++
.../taobao/weex/dom/action/AddRuleAction.java | 254 ++++
.../taobao/weex/dom/action/AnimationAction.java | 463 +++++++
.../weex/dom/action/CreateBodyAction.java | 302 +++++
.../weex/dom/action/CreateFinishAction.java | 224 +++
.../weex/dom/action/GetComponentRectAction.java | 299 ++++
.../weex/dom/action/InvokeMethodAction.java | 236 ++++
.../weex/dom/action/MoveElementAction.java | 281 ++++
.../weex/dom/action/RefreshFinishAction.java | 221 +++
.../weex/dom/action/RemoveElementAction.java | 286 ++++
.../weex/dom/action/RemoveEventAction.java | 264 ++++
.../weex/dom/action/ScrollToElementAction.java | 257 ++++
.../weex/dom/action/UpdateAttributeAction.java | 263 ++++
.../weex/dom/action/UpdateFinishAction.java | 237 ++++
.../weex/dom/action/UpdateStyleAction.java | 298 ++++
.../taobao/weex/ui/IExternalMoudleGetter.java | 215 +++
.../taobao/weex/ui/RenderActionContextImpl.java | 299 ++++
.../com/taobao/weex/ui/WXRenderManager.java | 191 +--
.../com/taobao/weex/ui/WXRenderStatement.java | 556 --------
.../ui/animation/DimensionUpdateListener.java | 6 +-
.../weex/ui/animation/WXAnimationBean.java | 5 +-
.../weex/ui/animation/WXAnimationModule.java | 199 +--
.../weex/ui/component/NestedContainer.java | 2 +
.../taobao/weex/ui/component/WXComponent.java | 12 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 6 +
.../java/com/taobao/weex/WXSDKManagerTest.java | 2 +-
.../com/taobao/weex/dom/WXDomStatementTest.java | 119 +-
.../com/taobao/weex/dom/action/TestActions.java | 59 +
.../taobao/weex/ui/WXRenderStatementTest.java | 4 +-
.../ui/animation/WXAnimationModuleTest.java | 18 +-
circle.yml | 37 -
test/pages/dom-operation.we | 5 +-
test/scripts/dom.test.js | 9 +
56 files changed, 8400 insertions(+), 3091 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6bc2a182/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6bc2a182/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6bc2a182/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------