You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/07 08:06:26 UTC
[49/50] incubator-weex git commit: Merge branch '0.13-dev' into dev
Merge branch '0.13-dev' into 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/536c38a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/536c38a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/536c38a2
Branch: refs/heads/dev
Commit: 536c38a29abbece191987bfbf54c0bc0480a12ac
Parents: 3a39b78 404f3cc
Author: sospartan <so...@apache.org>
Authored: Wed Jun 7 16:04:24 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 7 16:04:24 2017 +0800
----------------------------------------------------------------------
.gitignore | 1 +
.travis.yml | 10 +-
Dangerfile-ios | 1 +
WeexSDK.podspec | 4 +-
android/build.gradle | 9 +-
android/commons/build.gradle | 1 +
.../adapter/DefaultWebSocketAdapter.java | 54 +-
.../weex/commons/util/RequestIdGenerator.java | 15 +
.../weex/commons/util/WSEventReporter.java | 192 ++++++
.../gradle/wrapper/gradle-wrapper.properties | 4 +-
android/playground/app/build.gradle | 4 +-
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../java/com/alibaba/weex/WXPageActivity.java | 3 +-
.../extend/adapter/InterceptWXHttpAdapter.java | 57 +-
.../weex/extend/module/WXEventModule.java | 23 +-
android/run-ci.sh | 5 +-
android/sdk/assets/main.js | 8 -
android/sdk/build.gradle | 6 +
.../com/taobao/weex/LayoutFinishListener.java | 8 +
.../java/com/taobao/weex/WXEnvironment.java | 1 +
.../main/java/com/taobao/weex/WXSDKEngine.java | 6 +
.../java/com/taobao/weex/WXSDKInstance.java | 48 ++
.../main/java/com/taobao/weex/WXSDKManager.java | 15 +-
.../taobao/weex/adapter/ICrashInfoReporter.java | 9 +
.../taobao/weex/adapter/IDrawableLoader.java | 3 +-
.../weex/adapter/IWXUserTrackAdapter.java | 2 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 45 +-
.../com/taobao/weex/bridge/WXModuleManager.java | 44 +-
.../com/taobao/weex/common/WXPerformance.java | 9 +-
.../taobao/weex/dom/DOMActionContextImpl.java | 15 +-
.../com/taobao/weex/dom/TextDecorationSpan.java | 55 ++
.../java/com/taobao/weex/dom/WXDomHandler.java | 4 +
.../java/com/taobao/weex/dom/WXDomManager.java | 19 +
.../main/java/com/taobao/weex/dom/WXStyle.java | 32 +-
.../com/taobao/weex/dom/WXSwitchDomObject.java | 29 +-
.../com/taobao/weex/dom/WXTextDomObject.java | 11 +-
.../com/taobao/weex/dom/action/Actions.java | 12 +
.../taobao/weex/dom/action/AnimationAction.java | 3 +
.../weex/dom/action/CreateFinishAction.java | 20 +
.../weex/dom/action/ExecutableRenderAction.java | 30 +
.../weex/dom/action/ModuleInvocationAction.java | 50 ++
.../taobao/weex/ui/IExternalModuleGetter.java | 30 +
.../taobao/weex/ui/IExternalMoudleGetter.java | 29 -
.../ui/animation/DimensionUpdateListener.java | 14 +
.../weex/ui/animation/WXAnimationBean.java | 1 +
.../ui/component/AbstractEditComponent.java | 16 +-
.../taobao/weex/ui/component/WXComponent.java | 60 +-
.../weex/ui/component/WXTextDecoration.java | 1 +
.../ui/component/list/StickyHeaderHelper.java | 2 +-
.../taobao/weex/ui/module/WXTimerModule.java | 42 +-
.../com/taobao/weex/ui/view/WXImageView.java | 31 +-
.../weex/ui/view/border/BorderDrawable.java | 3 +-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 4 +
.../java/com/taobao/weex/utils/WXViewUtils.java | 34 +-
.../java/com/taobao/weex/WXSDKEngineTest.java | 1 -
.../java/com/taobao/weex/utils/WXUtilsTest.java | 16 +-
android/weex_debug/build.gradle | 10 +-
build/config.js | 4 +-
build/webpack.examples.web.config.js | 29 +-
build/webpack.test.web.config.js | 21 +-
dangerfile.js | 166 ++++-
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/iconfont.we | 63 +-
examples/index.we | 1 +
examples/vue/iconfont.vue | 80 ++-
examples/vue/index.vue | 3 +-
examples/vue/market/gcanvas.vue | 2 +-
html5/render/native/index.js | 33 +-
html5/render/native/setup.js | 58 ++
html5/render/vue/README.md | 23 +-
html5/render/vue/components/a.js | 19 +
html5/render/vue/components/div.js | 1 +
html5/render/vue/components/image.js | 1 +
html5/render/vue/components/index.js | 2 +-
html5/render/vue/components/input.js | 1 +
.../render/vue/components/scrollable/header.js | 1 +
.../vue/components/scrollable/list/cell.js | 1 +
.../vue/components/scrollable/list/index.js | 1 +
.../components/scrollable/loading-indicator.js | 1 +
.../render/vue/components/scrollable/loading.js | 1 +
.../render/vue/components/scrollable/refresh.js | 1 +
.../vue/components/scrollable/scroller.js | 1 +
html5/render/vue/components/slider/index.js | 155 +----
html5/render/vue/components/slider/indicator.js | 37 +-
.../render/vue/components/slider/slideMixin.js | 646 +++++++++++++++----
.../vue/components/slider/slider-neighbor.css | 21 -
.../vue/components/slider/slider-neighbor.js | 138 +---
html5/render/vue/components/slider/slider.css | 34 +
html5/render/vue/components/switch.js | 1 +
html5/render/vue/components/text.js | 1 +
html5/render/vue/components/textarea.js | 1 +
html5/render/vue/components/video.js | 28 +-
html5/render/vue/components/web.js | 1 +
html5/render/vue/core/node.js | 71 +-
html5/render/vue/core/style.js | 33 +-
html5/render/vue/env/index.js | 4 +-
html5/render/vue/env/viewport.js | 6 +-
html5/render/vue/env/weex.js | 33 +-
html5/render/vue/env/wx-env.js | 8 +-
html5/render/vue/index.js | 15 +
html5/render/vue/lib/envd/index.js | 179 +++++
html5/render/vue/lib/envd/params.js | 17 +
html5/render/vue/lib/envd/version.js | 152 +++++
html5/render/vue/lib/gesture.js | 512 +++++++++++++++
html5/render/vue/mixins/base.js | 54 +-
html5/render/vue/mixins/scrollable.js | 13 +-
html5/render/vue/mixins/style.js | 22 +-
html5/render/vue/modules/animation.js | 3 +
html5/render/vue/modules/dom.js | 40 +-
html5/render/vue/modules/modal/style.js | 2 +-
html5/render/vue/modules/modal/toast.js | 3 +-
html5/render/vue/utils/component.js | 20 +-
html5/render/vue/utils/func.js | 19 +
html5/render/vue/utils/lazyload.js | 17 +-
html5/render/vue/utils/perf.js | 123 +++-
html5/render/vue/utils/style.js | 151 +++--
html5/runtime/vdom/document.js | 4 +-
html5/runtime/vdom/element.js | 25 +-
.../render/vue/data/dotvue/event-bubble-bar.vue | 13 +-
.../render/vue/data/dotvue/event-bubble.vue | 17 +-
html5/test/render/vue/utils/style.js | 9 +-
html5/test/unit/default/vm/vm.js | 2 +-
.../WeexDemo.xcodeproj/project.pbxproj | 6 +
ios/playground/WeexDemo/AppDelegate.m | 4 +
.../WeexDemo/WXConfigCenterDefaultImpl.h | 25 +
.../WeexDemo/WXConfigCenterDefaultImpl.m | 45 ++
ios/playground/WeexDemo/WXDemoViewController.m | 16 +-
.../WeexDemo/extend/module/WXEventModule.m | 16 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 32 +-
ios/sdk/WeexSDK/Resources/main.js | 8 -
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 5 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 85 ++-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 13 +-
.../WeexSDK/Sources/Component/WXAComponent.m | 13 +-
.../Sources/Component/WXComponent_internal.h | 2 -
.../Sources/Component/WXCycleSliderComponent.m | 17 +-
.../Sources/Component/WXEmbedComponent.m | 2 +-
.../Sources/Component/WXImageComponent.m | 27 +-
.../Sources/Component/WXIndicatorComponent.m | 3 +
.../WeexSDK/Sources/Component/WXListComponent.m | 64 +-
.../Sources/Component/WXScrollerComponent.m | 39 +-
.../Sources/Component/WXSliderComponent.m | 1 +
.../Component/WXSliderNeighborComponent.m | 9 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 67 +-
.../Sources/Component/WXVideoComponent.m | 12 +-
.../WeexSDK/Sources/Component/WXWebComponent.m | 10 +-
.../Sources/Controller/WXBaseViewController.m | 19 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 13 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 34 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 24 +-
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +
.../WeexSDK/Sources/Manager/WXBridgeManager.h | 2 +
.../Sources/Manager/WXComponentManager.h | 2 +-
.../Sources/Manager/WXComponentManager.m | 32 +-
ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 8 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 33 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 17 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 49 +-
.../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 ++
.../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 ++++
.../WeexSDK/Sources/Module/WXAnimationModule.m | 30 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 1 +
.../WeexSDK/Sources/Module/WXModalUIModule.m | 1 +
.../WeexSDK/Sources/Module/WXPrerenderManager.h | 89 +++
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 314 +++++++++
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 6 +-
.../Sources/Network/WXResourceRequestHandler.h | 2 +
.../WXResourceRequestHandlerDefaultImpl.m | 5 +-
.../Sources/Protocol/WXConfigCenterProtocol.h | 20 +
.../Sources/Protocol/WXScrollerProtocol.h | 7 +
.../Sources/Protocol/WXURLRewriteProtocol.h | 5 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 6 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 7 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 98 +--
.../View/WXComponent+PseudoClassManagement.m | 4 +-
.../Sources/View/WXComponent+ViewManagement.m | 96 ++-
ios/sdk/WeexSDK/Sources/View/WXView.m | 1 +
ios/sdk/WeexSDK/Sources/WeexSDK.h | 3 +
package.json | 19 +-
packages/weex-vue-render/README.md | 23 +-
packages/weex-vue-render/package.json | 2 +-
pre-build/native-bundle-main.js | 8 +
test/.gitignore | 3 +-
test/mocha.opts | 2 +-
test/pages/components/hyperlink.vue | 31 +
test/pages/components/hyperlink_target.vue | 22 +
test/pages/components/scroller-fixed.vue | 14 +-
test/pages/components/slider-common.vue | 229 +++++++
test/pages/css/border.vue | 119 +++-
test/pages/modules/globalEvent.vue | 48 ++
test/pages/modules/vue_timer.vue | 75 +++
test/pages/modules/we_timer.we | 73 +++
test/screenshot/border-android.png | Bin 0 -> 196752 bytes
test/screenshot/border-ios.png | Bin 168396 -> 161202 bytes
test/screenshot/compositing-ios.png | Bin 228661 -> 228306 bytes
test/scripts/components/hyperlink.test.js | 44 ++
test/scripts/components/recycler.test.js | 16 +-
test/scripts/components/scroller-fixed.test.js | 5 +-
test/scripts/components/slider-common.test.js | 100 +++
test/scripts/components/text.test.js | 2 +-
test/scripts/css/border.test.js | 7 +-
test/scripts/modules/globalEvent.test.js | 60 ++
test/scripts/modules/timer.test.js | 100 +++
test/scripts/util.js | 30 +-
212 files changed, 6404 insertions(+), 1174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/android/build.gradle
----------------------------------------------------------------------
diff --cc android/build.gradle
index d5c17ec,746e508..3111d95
--- a/android/build.gradle
+++ b/android/build.gradle
@@@ -9,10 -9,6 +9,10 @@@ buildscript
}
}
++
+plugins {
+ id "de.undercouch.download" version "3.2.0"
+}
-
repositories {
mavenCentral()
jcenter()
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/android/sdk/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/dangerfile.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/ios/sdk/WeexSDK/Sources/Component/WXEmbedComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/536c38a2/package.json
----------------------------------------------------------------------