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/22 05:28:31 UTC
[40/40] incubator-weex git commit: Merge branch '0.14-dev' into dev
Merge branch '0.14-dev' into dev
Conflicts:
.travis.yml
android/sdk/build.gradle
doc/_config_cn.yml
test/screenshot/border-ios.png
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/450ba37e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/450ba37e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/450ba37e
Branch: refs/heads/0.15-dev
Commit: 450ba37ef3339f4ed7f8f3f9b9cf096bd28fb4f9
Parents: 29a705d 7fc1190
Author: sospartan <so...@apache.org>
Authored: Thu Jun 22 13:26:29 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 22 13:26:29 2017 +0800
----------------------------------------------------------------------
.travis.yml | 2 +-
LICENSE | 20 +-
POSSIBLE-NOTICES-FOR-BIN-DIST | 3 +
WeexSDK.podspec | 4 +-
android/build.gradle | 2 +-
android/run-ci.sh | 7 -
android/sdk/build.gradle | 14 +-
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 7575352 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12130116 bytes
.../com/taobao/weex/LayoutFinishListener.java | 18 +
.../java/com/taobao/weex/WXSDKInstance.java | 27 +-
.../taobao/weex/adapter/ICrashInfoReporter.java | 18 +
.../java/com/taobao/weex/bridge/WXBridge.java | 299 ++++++++++++++-
.../com/taobao/weex/bridge/WXBridgeManager.java | 362 +++++++++++++++++++
.../java/com/taobao/weex/common/Constants.java | 2 +
.../weex/common/ICheckBindingScroller.java | 18 +
.../java/com/taobao/weex/common/IWXBridge.java | 21 ++
.../java/com/taobao/weex/dom/WXDomModule.java | 3 +-
.../com/taobao/weex/dom/action/Actions.java | 58 ++-
.../taobao/weex/dom/action/AnimationAction.java | 37 +-
.../weex/dom/action/ExecutableRenderAction.java | 18 +
.../weex/dom/action/ModuleInvocationAction.java | 18 +
.../weex/dom/action/UpdateStyleAction.java | 4 +-
.../ui/animation/DimensionUpdateListener.java | 88 -----
.../weex/ui/animation/HeightProperty.java | 35 ++
.../weex/ui/animation/LayoutParamsProperty.java | 64 ++++
.../weex/ui/animation/WXAnimationBean.java | 72 ++--
.../taobao/weex/ui/animation/WidthProperty.java | 35 ++
.../ui/component/AbstractEditComponent.java | 14 +-
.../com/taobao/weex/ui/component/Textarea.java | 6 +
.../taobao/weex/ui/component/WXComponent.java | 18 +-
.../com/taobao/weex/ui/component/WXSlider.java | 4 +-
.../ui/component/list/BasicListComponent.java | 191 +++++++++-
.../ui/component/list/DefaultDragHelper.java | 173 +++++++++
.../weex/ui/component/list/DragHelper.java | 57 +++
.../ui/component/list/DragSupportCallback.java | 146 ++++++++
.../weex/ui/component/list/EventTrigger.java | 25 ++
.../taobao/weex/ui/module/WXTimerModule.java | 87 +++--
.../com/taobao/weex/ui/view/WXEditText.java | 9 +-
.../taobao/weex/utils/WXDataStructureUtil.java | 21 +-
.../com/taobao/weex/utils/WXResourceUtils.java | 2 +-
.../java/com/taobao/weex/WXSDKInstanceTest.java | 26 +-
.../weex/adapter/DefaultUriAdapterTest.java | 4 +-
.../clipboard/WXClipboardModuleTest.java | 4 +-
.../navigator/WXNavigatorModuleTest.java | 4 +-
.../appfram/storage/DefaultWXStorageTest.java | 32 +-
.../appfram/storage/WXStorageModuleTest.java | 16 +-
.../taobao/weex/bridge/WXBridgeManagerTest.java | 14 +-
.../com/taobao/weex/bridge/WXBridgeTest.java | 4 +-
.../com/taobao/weex/bridge/WXHashMapTest.java | 4 +-
.../taobao/weex/bridge/WXModuleManagerTest.java | 4 +-
.../java/com/taobao/weex/dom/WXAttrTest.java | 4 +-
.../com/taobao/weex/dom/WXDomModuleTest.java | 4 +-
.../com/taobao/weex/dom/WXDomObjectTest.java | 4 +-
.../com/taobao/weex/dom/WXDomStatementTest.java | 4 +-
.../taobao/weex/dom/WXTextDomObjectTest.java | 4 +-
.../ui/animation/WXAnimationModuleTest.java | 4 +-
.../weex/ui/component/EditComponentTest.java | 4 +-
.../taobao/weex/ui/component/TextareaTest.java | 4 +-
.../weex/ui/component/WXComponentTest.java | 4 +-
.../com/taobao/weex/ui/component/WXDivTest.java | 4 +-
.../taobao/weex/ui/component/WXEmbedTest.java | 4 +-
.../taobao/weex/ui/component/WXImageTest.java | 14 +-
.../taobao/weex/ui/component/WXLoadingTest.java | 4 +-
.../taobao/weex/ui/component/WXRefreshTest.java | 4 +-
.../weex/ui/component/WXScrollerTest.java | 4 +-
.../weex/ui/component/WXSliderNeighborTest.java | 4 +-
.../taobao/weex/ui/component/WXSliderTest.java | 4 +-
.../taobao/weex/ui/component/WXSwitchTest.java | 4 +-
.../taobao/weex/ui/component/WXVideoTest.java | 4 +-
.../com/taobao/weex/ui/component/WXWebTest.java | 4 +-
.../component/helper/WXTimeInputHelperTest.java | 4 +-
.../component/list/DefaultDragHelperTest.java | 132 +++++++
.../ui/component/list/WXListComponentTest.java | 4 +-
.../taobao/weex/ui/module/WXMetaModuleTest.java | 4 +-
.../weex/ui/module/WXModalUIModuleTest.java | 4 +-
.../weex/ui/module/WXTimerModuleTest.java | 48 ++-
.../weex/ui/module/WXWebViewModuleTest.java | 4 +-
.../weex/ui/view/WXCirclePageAdapterTest.java | 4 +-
.../taobao/weex/ui/view/WXScrollViewTest.java | 4 +-
.../com/taobao/weex/ui/view/WXWebViewTest.java | 9 +-
.../weex/ui/view/gesture/WXGestureTest.java | 4 +-
.../com/taobao/weex/utils/TypefaceUtilTest.java | 4 +-
.../com/taobao/weex/utils/WXFileUtilsTest.java | 17 +-
.../com/taobao/weex/utils/WXLogUtilsTest.java | 7 +-
.../weex/utils/WXReflectionUtilsTest.java | 4 +-
.../taobao/weex/bridge/WXWebsocketBridge.java | 88 +++++
dangerfile.js | 165 ++++++---
doc/source/cn/references/modules/picker.md | 2 +-
examples/vue/components/waterfall.vue | 165 ++++-----
html5/render/vue/components/index.js | 7 +-
.../render/vue/components/scrollable/header.js | 2 +-
.../vue/components/scrollable/list/index.js | 10 -
.../components/scrollable/loading-indicator.js | 152 +++++++-
.../render/vue/components/scrollable/loading.js | 4 +-
.../render/vue/components/scrollable/refresh.js | 4 +-
.../vue/components/scrollable/scroller.js | 15 -
.../vue/components/scrollable/waterfall.js | 338 +++++++++++++++++
html5/render/vue/components/slider/indicator.js | 8 +-
.../render/vue/components/slider/slideMixin.js | 15 +-
html5/render/vue/config.js | 21 ++
html5/render/vue/core/style.js | 103 ++++--
html5/render/vue/env/wx-env.js | 12 +-
html5/render/vue/index.js | 3 +-
html5/render/vue/mixins/base.js | 15 +-
html5/render/vue/mixins/index.js | 4 +-
html5/render/vue/mixins/scrollable.js | 87 ++++-
html5/render/vue/mixins/sticky.js | 65 ++++
html5/render/vue/mixins/style.js | 11 +-
html5/render/vue/modules/dom.js | 18 +-
html5/render/vue/modules/globalEvent.js | 69 ++++
html5/render/vue/modules/index.js | 2 +
html5/render/vue/styles/base.css | 86 ++---
html5/render/vue/styles/reset.css | 5 +
html5/render/vue/utils/component.js | 187 +++++++---
html5/render/vue/utils/func.js | 30 ++
html5/render/vue/utils/style.js | 33 ++
.../WeexDemo.xcodeproj/project.pbxproj | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 6 -
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 154 ++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 111 ++++++
.../Sources/Component/WXComponent_internal.h | 1 +
.../WeexSDK/Sources/Component/WXEditComponent.m | 7 +-
.../Sources/Component/WXImageComponent.m | 7 +-
.../Sources/Component/WXScrollerComponent.m | 5 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 16 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.h | 7 +
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 131 ++++++-
.../Sources/Controller/WXBaseViewController.m | 6 -
.../WeexSDK/Sources/Events/WXComponent+Events.m | 23 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 -
.../Sources/Manager/WXComponentManager.m | 5 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 5 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 68 +++-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 24 ++
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 38 ++
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 4 +-
.../Sources/View/WXComponent+ViewManagement.m | 13 +-
package.json | 4 +-
packages/weex-vue-render/README.md | 19 +-
packages/weex-vue-render/package.json | 2 +-
test/pages/css/border.vue | 15 +-
test/run.sh | 9 +
test/scripts/util.js | 5 +-
test/serve.sh | 3 +-
146 files changed, 4049 insertions(+), 827 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/450ba37e/.travis.yml
----------------------------------------------------------------------