Merge branch '0.16-dev' into 0.16-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/768b13ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/768b13ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/768b13ae Branch: refs/heads/master Commit: 768b13ae7d150b438bc1fc2fd392d38dd3a3a3a3 Parents: 316dfa2 53dfdbf Author: MrRaindrop <tekk...@gmail.com> Authored: Thu Aug 24 18:00:00 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Thu Aug 24 18:00:00 2017 +0800 ---------------------------------------------------------------------- .../commons/adapter/FrescoImageComponent.java | 2 +- .../java/com/alibaba/weex/WXPageActivity.java | 9 +- 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 +- .../com/taobao/weex/ui/component/WXImage.java | 75 +- .../com/taobao/weex/ui/component/WXText.java | 52 +- .../ui/component/list/BasicListComponent.java | 7 +- .../com/taobao/weex/ui/view/WXImageView.java | 16 +- .../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 | 1 + examples/vue/index.vue | 1 - examples/vue/transition.vue | 75 + html5/frameworks/legacy/app/differ.js | 2 +- html5/frameworks/legacy/vm/directive.js | 2 +- .../complex/component-append-tree.output.js | 22 + .../complex/component-append-tree.source.js | 87 + html5/test/case/tester.js | 19 + ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 5 +- .../WeexSDK/Sources/Component/WXListComponent.m | 52 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 15 +- 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/WXTransition.h | 2 - ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 214 +- ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 1 + ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 17 + .../Sources/View/WXComponent+ViewManagement.m | 1 - ios/sdk/WeexSDKTests/WXConvertTests.m | 21 +- package.json | 5 +- 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/components/text.test.js | 61 +- test/scripts/dom.test.js | 5 +- test/scripts/modules/globalEvent.test.js | 20 +- test/scripts/modules/modal-event.test.js | 2 +- test/scripts/modules/timer.test.js | 51 +- test/scripts/util.js | 2 + 59 files changed, 23020 insertions(+), 22079 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/768b13ae/package.json ----------------------------------------------------------------------
