You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/15 09:51:32 UTC
[07/16] incubator-weex git commit: Merge remote-tracking branch
'remotes/upstream/0.15-dev' into android-feature-tracing
Merge remote-tracking branch 'remotes/upstream/0.15-dev' into android-feature-tracing
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2e44c5f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2e44c5f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2e44c5f5
Branch: refs/heads/0.16-dev
Commit: 2e44c5f5f68ea7825cc5f6a3ca23485c1e4bfb5e
Parents: 102f2ed 43c5fdf
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 10 14:36:58 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 10 14:36:58 2017 +0800
----------------------------------------------------------------------
README.md | 51 +-
.../weex/extend/component/WXParallax.java | 4 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 7570392 bytes
.../java/com/taobao/weex/WXEnvironment.java | 4 +
.../java/com/taobao/weex/WXSDKInstance.java | 11 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 12 +-
.../java/com/taobao/weex/common/WXConfig.java | 1 +
.../java/com/taobao/weex/dom/WXDomModule.java | 1 -
.../taobao/weex/dom/WXRecyclerDomObject.java | 4 +
.../com/taobao/weex/dom/WXTextDomObject.java | 4 +-
.../com/taobao/weex/dom/action/Actions.java | 4 +-
.../taobao/weex/ui/component/WXComponent.java | 12 +-
.../taobao/weex/ui/component/WXScroller.java | 79 ++-
.../com/taobao/weex/ui/component/WXSlider.java | 12 +-
.../ui/component/list/BasicListComponent.java | 114 ++--
.../taobao/weex/ui/component/list/WXCell.java | 1 -
.../weex/ui/component/list/WXListComponent.java | 9 +-
.../weex/ui/view/WXHorizontalScrollView.java | 27 +
.../com/taobao/weex/ui/view/WXScrollView.java | 1 -
build/config.js | 1 +
build/karma.vue.conf.js | 16 +-
build/webpack.examples.web.config.js | 1 +
build/webpack.test.web.config.js | 1 +
doc/source/cn/references/modules/meta.md | 96 +++
doc/source/cn/references/modules/timer.md | 47 ++
doc/source/cn/references/weex-variable.md | 1 +
doc/source/references/modules/meta.md | 97 +++
doc/source/references/modules/timer.md | 58 ++
doc/source/references/weex-variable.md | 1 +
examples/vue/components/input.vue | 17 +
examples/vue/hello.vue | 2 +-
examples/vue/market/gcanvas.vue | 36 +-
.../vue/components/scrollable/list/index.js | 3 +-
.../vue/components/scrollable/scroller.js | 3 +-
.../vue/components/scrollable/waterfall.js | 3 +-
.../render/vue/components/slider/slideMixin.js | 17 +-
html5/render/vue/core/node.js | 172 +++--
html5/render/vue/core/style.js | 26 +-
html5/render/vue/env/global.js | 2 +
html5/render/vue/env/weex.js | 3 +
html5/render/vue/env/wx-env.js | 2 +-
html5/render/vue/mixins/base.js | 16 +-
html5/render/vue/mixins/scrollable.js | 18 +-
html5/render/vue/mixins/style.js | 58 +-
html5/render/vue/modules/websocket/websocket.js | 2 +
html5/render/vue/utils/event.js | 6 +-
html5/render/vue/utils/func.js | 136 +++-
html5/render/vue/utils/index.js | 104 ---
html5/render/vue/utils/perf.js | 3 +-
html5/render/vue/utils/style.js | 30 +-
html5/test/render/vue/core/node.js | 32 +-
html5/test/render/vue/core/scope-style-map.js | 4 +
.../render/vue/data/dotvue/event-bubble-bar.vue | 11 -
.../render/vue/data/dotvue/event-bubble.vue | 11 -
html5/test/render/vue/helper/utils.js | 10 +-
html5/test/render/vue/modules/modal.js | 225 +++++++
html5/test/render/vue/modules/websocket.js | 83 ++-
html5/test/render/vue/utils/component.js | 50 +-
html5/test/render/vue/utils/event.js | 78 +++
html5/test/render/vue/utils/func.js | 278 +++++++-
html5/test/render/vue/utils/lazyload.js | 106 +++
html5/test/render/vue/utils/perf.js | 132 ++++
html5/test/render/vue/utils/style.js | 157 ++++-
html5/test/render/vue/utils/type.js | 49 ++
html5/test/render/vue/validator/index.js | 31 +-
ios/playground/Podfile | 2 +-
.../WeexDemo.xcodeproj/project.pbxproj | 4 +
ios/playground/WeexDemo/WXDemoViewController.m | 2 +-
ios/sdk/WeexSDK-Dynamic/Info.plist | 24 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 642 ++++++++++++++++++-
.../xcschemes/WeexSDK-Dynamic.xcscheme | 80 +++
.../WeexSDK/Sources/Bridge/WXBridgeContext.h | 2 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 74 ++-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 35 +-
.../Component/Recycler/WXRecyclerComponent.h | 3 +-
.../Component/Recycler/WXRecyclerComponent.m | 5 +-
.../Recycler/WXSectionDataController.h | 2 +
.../WeexSDK/Sources/Component/WXAComponent.m | 2 +-
.../Sources/Component/WXCanvasComponent.h | 2 +-
.../Sources/Component/WXCycleSliderComponent.m | 6 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 4 +-
.../Sources/Component/WXFooterComponent.h | 2 +-
.../Sources/Component/WXHeaderComponent.h | 3 +-
.../Sources/Component/WXImageComponent.m | 5 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 57 +-
.../Sources/Component/WXScrollerComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 61 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 24 +-
.../Sources/Component/WXVideoComponent.m | 2 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
.../Sources/Controller/WXRootViewController.m | 1 +
.../Sources/Display/WXComponent+BoxShadow.h | 4 -
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 1 +
ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 10 +-
.../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +-
.../Sources/Manager/WXComponentManager.h | 3 +
.../Sources/Manager/WXComponentManager.m | 6 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +-
.../WeexSDK/Sources/Manager/WXServiceFactory.h | 2 +-
.../WeexSDK/Sources/Manager/WXTracingManager.h | 126 ++++
.../WeexSDK/Sources/Manager/WXTracingManager.m | 384 +++++++++++
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 5 +-
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 +
.../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 13 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 15 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 12 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 11 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +-
.../WeexSDK/Sources/Module/WXWebSocketModule.h | 1 -
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 1 +
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +
.../Sources/Protocol/WXURLRewriteProtocol.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 8 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 +
.../View/WXComponent+PseudoClassManagement.h | 4 +-
.../Sources/View/WXComponent+ViewManagement.m | 7 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 +
ios/sdk/buildScripts.sh | 2 +
package.json | 8 +-
packages/weex-vue-render/package.json | 8 +-
pre-build/native-bundle-main.js | 16 +-
127 files changed, 3738 insertions(+), 609 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2e44c5f5/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2e44c5f5/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2e44c5f5/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2e44c5f5/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2e44c5f5/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------