You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/17 07:31:07 UTC
[2/2] incubator-weex git commit: Merge branch '0.16-dev' into
ios-feature-layoutanimation-0.16dev
Merge branch '0.16-dev' into ios-feature-layoutanimation-0.16dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4fd66f11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4fd66f11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4fd66f11
Branch: refs/heads/0.16-dev
Commit: 4fd66f11941dafec2fce51e718b24b88be634980
Parents: 02b854c 245ee61
Author: Douma Fang <do...@gmail.com>
Authored: Thu Aug 17 13:54:18 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Aug 17 13:54:18 2017 +0800
----------------------------------------------------------------------
.travis.yml | 8 +-
HOW-TO-BUILD.md | 17 +-
SCRIPTS.md | 4 +-
android/build.gradle | 8 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes
.../java/com/taobao/weex/WXEnvironment.java | 2 +-
.../java/com/taobao/weex/WXSDKInstance.java | 37 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 36 +-
.../taobao/weex/adapter/ITracingAdapter.java | 31 +
.../java/com/taobao/weex/bridge/WXBridge.java | 8 +-
.../com/taobao/weex/bridge/WXBridgeManager.java | 102 +-
.../taobao/weex/bridge/WXValidateProcessor.java | 7 +-
.../java/com/taobao/weex/common/Constants.java | 4 +
.../taobao/weex/dom/DOMActionContextImpl.java | 15 +-
.../com/taobao/weex/dom/RenderActionTask.java | 26 +-
.../java/com/taobao/weex/dom/WXDomHandler.java | 8 +-
.../java/com/taobao/weex/dom/WXDomManager.java | 16 +-
.../java/com/taobao/weex/dom/WXDomModule.java | 39 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 41 +-
.../java/com/taobao/weex/dom/WXDomTask.java | 1 +
.../taobao/weex/dom/WXRecyclerDomObject.java | 9 +
.../com/taobao/weex/dom/WXTextDomObject.java | 91 +-
.../dom/action/AbstractAddElementAction.java | 28 +-
.../dom/action/AbstractLayoutFinishAction.java | 3 +-
.../weex/dom/action/AddElementAction.java | 26 +
.../taobao/weex/dom/action/AddEventAction.java | 24 +-
.../taobao/weex/dom/action/AnimationAction.java | 1 +
.../weex/dom/action/CreateBodyAction.java | 19 +
.../weex/dom/action/CreateFinishAction.java | 6 +
.../weex/dom/action/RefreshFinishAction.java | 4 +
.../taobao/weex/dom/action/TraceableAction.java | 82 +
.../weex/dom/action/UpdateAttributeAction.java | 2 +-
.../weex/dom/action/UpdateStyleAction.java | 2 +-
.../java/com/taobao/weex/tracing/Stopwatch.java | 132 +
.../java/com/taobao/weex/tracing/WXTracing.java | 129 +
.../com/taobao/weex/ui/WXRenderManager.java | 26 +-
.../ui/animation/CameraDistanceProperty.java | 54 +
.../weex/ui/animation/WXAnimationBean.java | 86 +-
.../ui/component/AbstractEditComponent.java | 2 +-
.../taobao/weex/ui/component/WXComponent.java | 81 +-
.../com/taobao/weex/ui/component/WXSlider.java | 8 +-
.../taobao/weex/ui/component/WXVContainer.java | 18 +
.../ui/component/list/BasicListComponent.java | 1 +
.../weex/ui/view/WXBaseCircleIndicator.java | 3 +-
.../taobao/weex/ui/view/WXCircleViewPager.java | 57 +-
.../ui/view/refresh/core/WXSwipeLayout.java | 15 +-
.../ui/view/refresh/wrapper/BaseBounceView.java | 2 +-
.../java/com/taobao/weex/utils/WXLogUtils.java | 45 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 4 +-
.../com/taobao/weex/utils/WXLogUtilsTest.java | 1 -
build/build.js | 1 +
build/config.js | 21 +-
dangerfile.js | 5 +-
doc/source/_posts/arkit.md | 112 +
doc/source/_posts/cn/hello.md | 6 -
doc/source/_posts/hello_world.md | 7 -
doc/source/_posts/test.md | 14 -
doc/source/cn/blog/index.md | 4 -
.../cn/references/advanced/extend-to-ios.md | 4 +-
.../advanced/integrate-devtool-to-android.md | 86 +-
doc/source/cn/references/common-style.md | 2 +
doc/source/cn/references/components/text.md | 4 +-
doc/source/cn/references/modules/animation.md | 2 +-
doc/source/references/advanced/extend-to-ios.md | 5 +-
doc/source/references/common-style.md | 2 +
doc/source/references/components/text.md | 4 +-
doc/source/references/modules/animation.md | 2 +-
doc/themes/weex/layout/_partial/header.ejs | 1 +
.../weex/layout/_partial/post/summary.ejs | 1 +
doc/themes/weex/source/css/blog.scss | 3 +
doc/themes/weex/source/css/media-queries.scss | 1 +
doc/themes/weex/source/css/partial/header.scss | 6 +-
examples/vanilla/index.js | 4 +-
examples/vue/market/gcanvas.vue | 10 +-
examples/vue/modules/websocket.vue | 22 +-
html5/frameworks/vanilla/index.js | 32 +-
html5/render/native/setup.js | 2 +-
html5/render/vue/README.md | 15 +
html5/render/vue/components/image.js | 58 +-
html5/render/vue/config.js | 10 +-
html5/render/vue/core/node.js | 27 +-
html5/render/vue/lib/gesture.js | 6 +
html5/render/vue/modules/modal/toast.js | 23 +-
html5/runtime/api/config.js | 37 +
html5/runtime/api/init.js | 227 +
html5/runtime/api/service.js | 77 +
html5/runtime/bridge/CallbackManager.js | 58 +
html5/runtime/bridge/Handler.js | 91 +
html5/runtime/bridge/Listener.js | 220 +
html5/runtime/bridge/TaskCenter.js | 130 +
html5/runtime/bridge/normalize.js | 91 +
html5/runtime/callback-manager.js | 58 -
html5/runtime/config.js | 36 -
html5/runtime/handler.js | 91 -
html5/runtime/index.js | 11 +-
html5/runtime/init.js | 215 -
html5/runtime/listener.js | 227 -
html5/runtime/normalize.js | 107 -
html5/runtime/service.js | 77 -
html5/runtime/task-center.js | 132 -
html5/runtime/utils.js | 54 +
html5/runtime/vdom/Comment.js | 43 +
html5/runtime/vdom/Document.js | 188 +
html5/runtime/vdom/Element.js | 454 +
html5/runtime/vdom/Node.js | 47 +
html5/runtime/vdom/WeexElement.js | 84 +
html5/runtime/vdom/comment.js | 47 -
html5/runtime/vdom/directive.js | 69 +
html5/runtime/vdom/document.js | 194 -
html5/runtime/vdom/element-types.js | 83 -
html5/runtime/vdom/element.js | 459 -
html5/runtime/vdom/index.js | 16 +-
html5/runtime/vdom/node.js | 49 -
html5/runtime/vdom/operation.js | 8 -
html5/test/case/prepare.js | 4 +-
html5/test/render/vue/core/node.js | 2 +
html5/test/unit/default/app/bundle.js | 98 +-
html5/test/unit/default/helper/document.js | 145 -
html5/test/unit/default/runtime.js | 485 -
html5/test/unit/default/vm/compiler.js | 614 -
html5/test/unit/default/vm/directive.js | 279 -
html5/test/unit/default/vm/dom-helper.js | 2 +-
html5/test/unit/default/vm/vm.js | 2 +-
html5/test/unit/runtime/legacy-framework.js | 353 +
html5/test/unit/runtime/runner/helper.js | 73 +
html5/test/unit/runtime/runner/vanilla.js | 59 +
html5/test/unit/runtime/runner/vue.js | 67 +
html5/test/unit/runtime/vdom/directive.js | 101 +
html5/test/unit/runtime/vdom/index.js | 639 +
html5/test/unit/runtime/vdom/listener.js | 381 +
html5/test/unit/runtime/vdom/node.js | 39 +
html5/test/unit/shared/BroadcastChannel.js | 7 -
html5/test/unit/shared/arrayFrom.js | 5 -
html5/test/unit/shared/index.js | 20 +-
html5/test/unit/vanilla/index.js | 13 -
html5/test/unit/vdom/index.js | 659 -
html5/test/unit/vdom/listener.js | 423 -
html5/test/unit/vdom/node.js | 39 -
ios/.gitignore | 1 +
.../WeexDemo.xcodeproj/project.pbxproj | 30 +-
ios/playground/WeexDemo/AppDelegate.m | 8 +-
ios/playground/WeexDemo/WXDemoViewController.m | 2 -
ios/playground/WeexDemo/WXExtModule.h | 26 +
ios/playground/WeexDemo/WXExtModule.m | 43 +
.../WeexDemo/WXExtendCallNativeTest.h | 25 +
.../WeexDemo/WXExtendCallNativeTest.m | 47 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 40 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 +-
.../Component/Recycler/WXRecyclerComponent.m | 58 +-
.../Recycler/WXRecyclerDragController.h | 52 +
.../Recycler/WXRecyclerDragController.m | 208 +
.../Sources/Component/WXImageComponent.m | 150 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 4 +-
.../Sources/Component/WXScrollerComponent.m | 3 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 5 +-
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h | 4 +
ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m | 10 +
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h | 10 +
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 6 +
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
.../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +-
.../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +-
.../WeexSDK/Sources/Manager/WXBridgeManager.m | 4 +
.../Sources/Manager/WXComponentFactory.h | 1 +
.../Sources/Manager/WXComponentFactory.m | 23 +
.../Sources/Manager/WXComponentManager.m | 18 +-
.../Sources/Manager/WXExtendCallNativeManager.h | 26 +
.../Sources/Manager/WXExtendCallNativeManager.m | 80 +
.../WeexSDK/Sources/Manager/WXModuleFactory.h | 6 +
.../WeexSDK/Sources/Manager/WXModuleFactory.m | 24 +
.../WeexSDK/Sources/Manager/WXTracingManager.h | 33 +-
.../WeexSDK/Sources/Manager/WXTracingManager.m | 169 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 1 -
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 15 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 +
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +-
ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 9 +
.../Sources/Protocol/WXAppMonitorProtocol.h | 2 +
.../Protocol/WXExtendCallNativeProtocol.h | 47 +
.../Sources/Protocol/WXJSExceptionProtocol.h | 10 +
.../Sources/Protocol/WXTracingProtocol.h | 29 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 +
.../Sources/View/WXComponent+ViewManagement.m | 1 -
.../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 3 +
package.json | 16 +-
packages/weex-html5/index.js | 38779 +++++++++++++++++
packages/weex-html5/index.min.js | 1 +
packages/weex-js-framework/index.js | 16899 +++----
packages/weex-js-framework/index.min.js | 2 +-
packages/weex-js-framework/package.json | 2 +-
packages/weex-js-runtime/index.js | 2373 +-
packages/weex-js-runtime/index.min.js | 6 +-
packages/weex-js-runtime/index.min.js.gz | Bin 12588 -> 13215 bytes
packages/weex-js-runtime/package.json | 2 +-
packages/weex-legacy-framework/index.js | 23 +-
packages/weex-legacy-framework/index.min.js | 2 +-
packages/weex-legacy-framework/package.json | 2 +-
packages/weex-vanilla-framework/.npmignore | 4 +
packages/weex-vanilla-framework/index.js | 136 +
packages/weex-vanilla-framework/index.min.js | 1 +
packages/weex-vanilla-framework/package.json | 21 +
packages/weex-vue-render/README.md | 15 +
packages/weex-vue-render/package.json | 2 +-
pre-build/native-bundle-main.js | 16 +-
scripts/build_from_source.sh | 10 +-
test/pages/components/iconfont.vue | 71 +
test/pages/components/input-event.vue | 65 +
test/pages/components/refresh-loading.vue | 115 +
test/pages/components/switch-event.vue | 60 +
test/pages/components/web-event.vue | 56 +
test/pages/include/button.vue | 162 +
test/pages/include/h1.vue | 13 +
test/pages/include/h2.vue | 13 +
test/pages/include/h3.vue | 13 +
test/pages/include/hn.vue | 47 +
test/pages/include/panel.vue | 141 +
test/pages/include/wxc-desc.vue | 66 +
test/pages/modules/animation-translate.vue | 129 +
test/pages/modules/clipboard-event.vue | 57 +
test/pages/modules/cover-generate.vue | 53 +
test/pages/modules/downgrade-event.vue | 74 +
test/pages/modules/gesture-longpress.vue | 75 +
test/pages/modules/modal-event.vue | 61 +
test/pages/modules/picker-event.vue | 63 +
test/pages/modules/storage-event.vue | 59 +
test/pages/modules/stream-result.vue | 85 +
test/run.sh | 24 +-
test/screenshot/border-android.png | Bin 156247 -> 158634 bytes
test/scripts/components/iconfont.test.js | 34 +
test/scripts/components/input-event.test.js | 36 +
test/scripts/components/refresh-loading.test.js | 38 +
test/scripts/components/switch-event.test.js | 38 +
test/scripts/components/web-event.test.js | 30 +
.../scripts/modules/animation-translate.test.js | 40 +
test/scripts/modules/clipboard-event.test.js | 35 +
test/scripts/modules/downgrade-event.test.js | 30 +
test/scripts/modules/gesture-longpress.test.js | 37 +
test/scripts/modules/modal-event.test.js | 35 +
test/scripts/modules/picker-event.test.js | 41 +
test/scripts/modules/storage-event.test.js | 36 +
test/scripts/modules/stream-result.test.js | 34 +
test/scripts/util.js | 41 +
test/scripts/zcover-generate.js | 32 +
test/serve.sh | 2 +-
248 files changed, 57632 insertions(+), 14145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4fd66f11/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4fd66f11/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4fd66f11/package.json
----------------------------------------------------------------------