Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-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/b2128b73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b2128b73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b2128b73 Branch: refs/heads/0.16-dev Commit: b2128b731d9842f4d06d84bfdf4945337ce2e0e5 Parents: 4c9e5d5 1584c88 Author: acton393 <zhangxing610...@gmail.com> Authored: Thu Aug 24 18:37:07 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Thu Aug 24 18:37:07 2017 +0800 ---------------------------------------------------------------------- .../commons/adapter/FrescoImageComponent.java | 2 +- .../java/com/alibaba/weex/WXPageActivity.java | 9 +- android/sdk/build.gradle | 6 + android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes .../java/com/taobao/weex/WXEnvironment.java | 16 +- .../main/java/com/taobao/weex/WXSDKEngine.java | 3 +- .../java/com/taobao/weex/WXSDKInstance.java | 38 +- .../taobao/weex/adapter/IDrawableLoader.java | 11 +- .../java/com/taobao/weex/bridge/WXBridge.java | 14 + .../com/taobao/weex/bridge/WXBridgeManager.java | 175 +- .../java/com/taobao/weex/common/IWXBridge.java | 2 + .../com/taobao/weex/common/WXErrorCode.java | 14 +- .../taobao/weex/common/WXJSBridgeMsgType.java | 2 + .../com/taobao/weex/dom/action/Actions.java | 3 + .../weex/dom/action/ReloadPageAction.java | 64 + .../taobao/weex/dom/action/TraceableAction.java | 1 + .../ui/component/AbstractEditComponent.java | 4 +- .../taobao/weex/ui/component/WXComponent.java | 14 +- .../com/taobao/weex/ui/component/WXImage.java | 75 +- .../com/taobao/weex/ui/component/WXText.java | 52 +- .../ui/component/list/BasicListComponent.java | 148 +- .../ui/component/list/SimpleListComponent.java | 6 +- .../ui/component/list/StickyHeaderHelper.java | 71 +- .../weex/ui/component/list/WXListComponent.java | 52 +- .../com/taobao/weex/ui/view/WXImageView.java | 16 +- .../ui/view/refresh/core/WXSwipeLayout.java | 2 +- .../com/taobao/weex/utils/ImageDrawable.java | 17 +- .../com/taobao/weex/utils/TypefaceUtil.java | 8 + .../java/com/taobao/weex/utils/WXUtils.java | 52 +- .../taobao/weex/bridge/WXWebsocketBridge.java | 6 + dangerfile.js | 23 +- examples/vue/index.vue | 5 +- examples/vue/showcase/a-node-click.vue | 74 + examples/vue/showcase/tap-penetrate.vue | 206 + examples/vue/transition.vue | 75 + html5/frameworks/legacy/app/differ.js | 2 +- html5/frameworks/legacy/vm/directive.js | 2 +- html5/render/browser/extend/api/storage.js | 4 +- html5/render/vue/core/node.js | 64 +- html5/render/vue/utils/event.js | 32 +- .../complex/component-append-tree.output.js | 22 + .../complex/component-append-tree.source.js | 87 + html5/test/case/tester.js | 19 + html5/test/render/vue/core/node.js | 1 - html5/test/render/vue/utils/event.js | 10 + ios/playground/WeexDemo/WXExtModule.m | 7 + ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 20 +- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 5 +- .../WeexSDK/Sources/Component/WXAComponent.m | 1 + .../Sources/Component/WXComponent_internal.h | 1 + .../Sources/Component/WXCycleSliderComponent.m | 56 + .../Sources/Component/WXImageComponent.m | 3 +- .../WeexSDK/Sources/Component/WXListComponent.m | 52 +- .../Sources/Component/WXSliderComponent.m | 53 + .../Component/WXSliderNeighborComponent.m | 14 + .../Sources/Component/WXSwitchComponent.m | 1 + .../Sources/Component/WXTextAreaComponent.m | 3 + .../WeexSDK/Sources/Component/WXTextComponent.m | 33 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 + .../Sources/Manager/WXDatePickerManager.m | 8 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 2 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 23 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 7 + .../WeexSDK/Sources/Module/WXAnimationModule.h | 4 - .../WeexSDK/Sources/Module/WXAnimationModule.m | 7 - ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 44 + ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 2 - ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 214 +- .../WeexSDK/Sources/Module/WXVoiceOverModule.h | 25 + .../WeexSDK/Sources/Module/WXVoiceOverModule.m | 148 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 1 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 17 + .../Sources/View/WXComponent+ViewManagement.m | 1 - ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 + ios/sdk/WeexSDKTests/WXConvertTests.m | 21 +- package.json | 7 +- packages/weex-js-framework/index.js | 43740 +++++++++-------- packages/weex-js-framework/index.min.js | 9 +- pre-build/native-bundle-main.js | 16 +- test/pages/components/switch-event.vue | 7 +- test/pages/include/wxc-desc.vue | 27 +- test/pages/modules/vue_timer.vue | 8 +- test/scripts/attributes/compositing.test.js | 4 +- test/scripts/components/hyperlink.test.js | 4 +- test/scripts/components/iconfont.test.js | 4 +- test/scripts/components/image-onload.test.js | 4 +- test/scripts/components/input-event.test.js | 4 +- test/scripts/components/recycler.test.js | 4 +- test/scripts/components/refresh-loading.test.js | 4 +- test/scripts/components/scroll-event.test.js | 8 +- test/scripts/components/scroller-fixed.test.js | 4 +- test/scripts/components/slider-common.test.js | 4 +- test/scripts/components/slider-infinite.test.js | 4 +- test/scripts/components/switch-event.test.js | 4 +- test/scripts/components/text.test.js | 63 +- .../components/textarea-maxlength.test.js | 4 +- test/scripts/components/web-event.test.js | 4 +- test/scripts/css/border.test.js | 4 +- test/scripts/dom.test.js | 9 +- test/scripts/index.test.js | 4 +- .../scripts/modules/animation-translate.test.js | 4 +- test/scripts/modules/clipboard-event.test.js | 4 +- test/scripts/modules/downgrade-event.test.js | 4 +- test/scripts/modules/gesture-longpress.test.js | 4 +- test/scripts/modules/globalEvent.test.js | 24 +- test/scripts/modules/modal-event.test.js | 5 +- test/scripts/modules/picker-event.test.js | 4 +- test/scripts/modules/storage-event.test.js | 4 +- test/scripts/modules/stream-result.test.js | 4 +- test/scripts/modules/timer.test.js | 55 +- test/scripts/util.js | 2 + test/scripts/zcover-generate.js | 4 +- 114 files changed, 24033 insertions(+), 22324 deletions(-) ----------------------------------------------------------------------
