You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/06/27 08:27:47 UTC
[3/6] incubator-weex git commit: Merge branch 'master' into
release-0.19-bugfix0619
Merge branch 'master' into release-0.19-bugfix0619
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9927930c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9927930c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9927930c
Branch: refs/heads/master
Commit: 9927930c143df7f40f038cf7896abf6b65c46150
Parents: 42f6c73 049d19f
Author: codefurture <gu...@163.com>
Authored: Wed Jun 27 16:03:41 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Jun 27 16:03:41 2018 +0800
----------------------------------------------------------------------
POSSIBLE-NOTICES-FOR-BIN-DIST | 11 +--
README.md | 84 ++++++++++----------
android/sdk/assets/weex-main-jsfm.js | 2 +-
android/sdk/assets/weex-rax-api.js | 2 +-
.../java/com/taobao/weex/WXSDKInstance.java | 8 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 3 +-
.../weex/ui/action/GraphicActionAddElement.java | 4 +-
.../weex/ui/action/GraphicActionAnimation.java | 14 +++-
.../ui/action/GraphicActionMoveElement.java | 5 --
.../ui/action/GraphicActionRemoveElement.java | 9 ++-
.../taobao/weex/ui/component/WXComponent.java | 3 +-
.../taobao/weex/ui/module/WXTimerModule.java | 22 ++---
examples/vue/include/base-url.js | 2 +-
index.html | 14 +---
.../Sources/Component/WXComponent_internal.h | 5 ++
.../Sources/Component/WXEditComponent.mm | 14 +++-
.../Sources/Component/WXTextComponent.mm | 18 +++--
.../Sources/Manager/WXComponentManager.mm | 15 +++-
ios/sdk/WeexSDK/Sources/Model/WXComponent.mm | 4 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXTransition.mm | 9 ++-
ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 6 +-
.../Sources/View/WXComponent+ViewManagement.mm | 5 +-
package.json | 7 +-
pre-build/weex-main-jsfm.js | 2 +-
pre-build/weex-rax-api.js | 2 +-
scripts/build_from_source.sh | 0
scripts/generate_apache_release.sh | 16 ++--
scripts/release_files.rules | 10 ++-
weex_core/Source/__init__.py | 0
weex_core/Source/android/__init__.py | 0
.../Source/android/jniprebuild/__init__.py | 0
.../core/render/manager/render_manager.cpp | 33 ++++++--
.../Source/core/render/manager/render_manager.h | 24 +++---
.../Source/core/render/node/render_list.cpp | 12 +--
.../Source/core/render/node/render_mask.cpp | 4 +-
.../Source/core/render/node/render_object.cpp | 2 +-
.../Source/core/render/page/render_page.cpp | 1 +
weex_core/Source/core/render/page/render_page.h | 7 ++
weex_core/__init__.py | 0
40 files changed, 217 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9927930c/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------