Merge remote-tracking branch 'remotes/upstream/release-0.16' into android-feature-ripple-background
# Conflicts: # android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.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/c38239b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c38239b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c38239b3 Branch: refs/heads/master Commit: c38239b3c00ac644854ce757d73f40df3a3763ba Parents: bdad06d ccf0590 Author: misakuo <misa...@apache.org> Authored: Mon Oct 16 11:10:17 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Mon Oct 16 11:10:17 2017 +0800 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 34 +- CONTRIBUTING.md | 20 +- README.md | 1 + WeexSDK.podspec | 2 +- android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 22620 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 342264 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 6754016 -> 6754016 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12126020 bytes .../main/java/com/taobao/weex/WXSDKEngine.java | 3 +- .../java/com/taobao/weex/WXSDKInstance.java | 11 +- .../taobao/weex/bridge/NativeInvokeHelper.java | 2 +- .../java/com/taobao/weex/bridge/WXBridge.java | 43 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 184 +- .../java/com/taobao/weex/common/IWXBridge.java | 9 + .../main/java/com/taobao/weex/dom/WXAttr.java | 15 +- .../com/taobao/weex/dom/WXCellDomObject.java | 11 + .../java/com/taobao/weex/dom/WXDomManager.java | 4 + .../java/com/taobao/weex/dom/WXDomObject.java | 19 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 3 + .../taobao/weex/dom/WXRecyclerDomObject.java | 50 +- .../com/taobao/weex/dom/WXTextDomObject.java | 39 +- .../dom/action/AbstractAddElementAction.java | 12 +- .../com/taobao/weex/dom/binding/ELUtils.java | 14 +- .../taobao/weex/dom/binding/WXStatement.java | 93 +- .../java/com/taobao/weex/dom/flex/CSSNode.java | 32 +- .../com/taobao/weex/el/parse/ArrayStack.java | 3 - .../java/com/taobao/weex/el/parse/Block.java | 7 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 3 - .../java/com/taobao/weex/el/parse/Symbol.java | 3 +- .../java/com/taobao/weex/el/parse/Token.java | 5 +- .../taobao/weex/ui/component/WXComponent.java | 23 +- .../weex/ui/component/binding/Layouts.java | 106 +- .../weex/ui/component/binding/Statements.java | 129 +- .../ui/component/list/BasicListComponent.java | 82 +- .../taobao/weex/ui/component/list/WXCell.java | 30 + .../list/template/CellLifecycleManager.java | 211 - .../component/list/template/DomTreeBuilder.java | 100 + .../component/list/template/TemplateCache.java | 30 + .../list/template/TemplateViewHolder.java | 9 + .../list/template/WXRecyclerTemplateList.java | 390 +- .../weex/ui/view/WXBaseCircleIndicator.java | 40 +- .../com/taobao/weex/utils/BoxShadowUtil.java | 65 +- .../java/com/taobao/weex/utils/WXFileUtils.java | 26 + .../java/com/taobao/weex/utils/WXLogUtils.java | 17 + .../taobao/weex/utils/WXReflectionUtils.java | 6 + .../taobao/weex/utils/WXSoInstallMgrSdk.java | 56 + .../java/com/taobao/weex/WXSDKEngineTest.java | 12 +- .../java/com/taobao/weex/el/ParserTest.java | 4 +- .../ui/component/binding/StatementTest.java | 8 +- .../com/taobao/weex/utils/WXFileUtilsTest.java | 8 + .../taobao/weex/bridge/WXWebsocketBridge.java | 15 + build/build.js | 17 +- build/config.js | 15 +- build/karma.vue.conf.js | 2 + dangerfile-android.js | 8 +- dangerfile-ios.js | 10 +- dangerfile-jsfm.js | 8 +- dangerfile.js | 6 +- doc/source/cn/guide/set-up-env.md | 68 +- .../cn/references/advanced/extend-to-ios.md | 4 +- doc/source/cn/references/components/image.md | 24 + doc/source/cn/references/modules/animation.md | 5 +- doc/source/cn/releasenote.md | 51 + doc/source/guide/set-up-env.md | 82 +- doc/source/references/advanced/extend-to-ios.md | 4 +- doc/source/references/components/image.md | 22 + doc/source/references/modules/animation.md | 6 +- doc/source/releasenote.md | 51 + examples/component/web-demo.we | 3 +- examples/vue/showcase/a-node-click.vue | 6 +- html5/render/browser/extend/api/stream.js | 2 +- html5/render/vue/README.md | 42 + html5/render/vue/components/a.js | 19 +- html5/render/vue/components/div.js | 4 +- html5/render/vue/components/input.js | 9 +- html5/render/vue/components/scrollable/cell.js | 3 +- .../render/vue/components/scrollable/header.js | 5 +- html5/render/vue/components/scrollable/list.js | 2 +- .../components/scrollable/loading-indicator.js | 13 +- .../components/scrollable/mixins/scrollable.js | 59 +- .../vue/components/scrollable/scroller.js | 2 +- .../render/vue/components/scrollable/style.css | 22 +- .../vue/components/scrollable/waterfall.js | 2 +- html5/render/vue/components/slider/index.js | 2 + html5/render/vue/components/slider/indicator.js | 2 + .../render/vue/components/slider/slideMixin.js | 13 +- html5/render/vue/components/slider/slider.css | 6 + html5/render/vue/components/switch.js | 12 +- html5/render/vue/components/text.js | 3 + html5/render/vue/core/node.js | 148 +- html5/render/vue/env/event-manager.js | 168 + html5/render/vue/env/viewport.js | 8 + html5/render/vue/env/weex.js | 21 + html5/render/vue/index.js | 15 + html5/render/vue/lib/envd/index.js | 6 +- html5/render/vue/lib/gesture.js | 2 +- html5/render/vue/mixins/base.js | 4 +- html5/render/vue/mixins/input-common.js | 38 +- html5/render/vue/mixins/style.js | 18 +- html5/render/vue/modules/animation.js | 44 +- html5/render/vue/modules/index.js | 4 +- html5/render/vue/modules/meta.js | 36 + html5/render/vue/modules/modal/style.js | 20 +- html5/render/vue/styles/base.css | 15 + html5/render/vue/styles/reset.css | 5 +- html5/render/vue/utils/component.js | 166 +- html5/render/vue/utils/event.js | 16 + html5/render/vue/utils/func.js | 5 +- html5/render/vue/utils/style.js | 13 +- html5/runtime/index.js | 4 +- html5/runtime/vdom/Document.js | 15 +- html5/runtime/vdom/Element.js | 45 +- html5/test/render/vue/components/switch.js | 5 +- html5/test/render/vue/components/text.js | 4 +- html5/test/render/vue/components/web.js | 4 +- html5/test/render/vue/helper/index.js | 11 + html5/test/render/vue/utils/component.js | 5 - html5/test/unit/default/vm/events.js | 4 +- html5/test/unit/default/vm/vm.js | 2 +- html5/test/unit/runtime/vdom/index.js | 2 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../RecycleList/WXComponent+DataBinding.h | 2 +- .../RecycleList/WXComponent+DataBinding.mm | 11 +- .../RecycleList/WXRecycleListUpdateManager.h | 1 + .../Sources/Component/WXComponent_internal.h | 2 + .../Sources/Component/WXImageComponent.m | 88 +- .../Sources/Component/WXScrollerComponent.m | 45 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 11 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 5 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 2 + .../Sources/Controller/WXBaseViewController.h | 2 +- .../Sources/Controller/WXBaseViewController.m | 6 + .../Sources/Controller/WXRootViewController.m | 1 + .../Sources/Display/WXComponent+Display.m | 14 +- .../WeexSDK/Sources/Events/WXComponent+Events.m | 15 +- .../WeexSDK/Sources/Loader/WXResourceLoader.m | 10 + .../WeexSDK/Sources/Manager/WXBridgeManager.h | 4 +- .../Sources/Manager/WXComponentManager.m | 4 +- .../WeexSDK/Sources/Manager/WXTracingManager.m | 6 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 63 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 8 + .../WeexSDK/Sources/Module/WXNavigatorModule.h | 3 +- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 16 + ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 24 + .../WeexSDK/Sources/Module/WXWebSocketModule.m | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 4 +- ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 7 +- ios/sdk/WeexSDK/Sources/View/WXView.m | 9 + ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +- package.json | 12 +- packages/weex-js-framework/index.js | 44451 +++++++++-------- packages/weex-js-framework/index.min.js | 9 +- packages/weex-js-framework/package.json | 2 +- packages/weex-js-runtime/index.js | 270 +- packages/weex-js-runtime/index.min.js | 6 +- packages/weex-js-runtime/index.min.js.gz | Bin 13215 -> 0 bytes .../weex-vue-slider/package.json | 2 +- packages/weex-vue-render/README.md | 42 + packages/weex-vue-render/package.json | 8 +- packages/weex-vue-render/src/index.core.js | 20 +- packages/weex-vue-render/src/index.js | 17 +- pre-build/native-bundle-main.js | 16 +- scripts/commit-msg.sh | 6 +- scripts/release_files.rules | 1 + start | 5 +- vue.html | 15 +- 167 files changed, 25175 insertions(+), 23535 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c38239b3/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index e524a0c,d801290..5a1d046 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java @@@ -74,7 -68,7 +74,8 @@@ import com.taobao.weex.tracing.Stopwatc import com.taobao.weex.tracing.WXTracing; import com.taobao.weex.ui.IFComponentHolder; import com.taobao.weex.ui.animation.WXAnimationModule; +import com.taobao.weex.ui.component.pesudo.OnActivePseudoListener; + import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner; import com.taobao.weex.ui.component.pesudo.PesudoStatus; import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener; import com.taobao.weex.ui.flat.FlatComponent;
