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/15 05:46:14 UTC
[3/6] incubator-weex git commit: Merge branch '0.14-dev' into
android-bugfix-list-onscroll
Merge branch '0.14-dev' into android-bugfix-list-onscroll
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d35a927f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d35a927f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d35a927f
Branch: refs/heads/0.14-dev
Commit: d35a927f0a85e6be64ba6880944090c8ca51cc1b
Parents: f8e2970 45cb5f0
Author: moxun <fu...@foxmail.com>
Authored: Fri Jun 9 13:04:09 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Jun 9 13:04:09 2017 +0800
----------------------------------------------------------------------
.travis.yml | 8 +-
HOW-TO-BUILD.md | 80 +++
LICENSE | 22 +-
POSSIBLE-NOTICES-FOR-BIN-DIST | 3 +
README_RELEASE.md | 74 ---
RUN-RAT.md | 12 +
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/component/WXParallax.java | 345 ++++++++++
android/run-ci.sh | 2 +-
android/sdk/build.gradle | 20 +-
.../com/taobao/weex/LayoutFinishListener.java | 18 +
.../taobao/weex/adapter/ICrashInfoReporter.java | 18 +
.../com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../weex/common/ICheckBindingScroller.java | 27 +
.../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 +
.../taobao/weex/ui/component/WXComponent.java | 27 +-
.../taobao/weex/ui/component/WXScroller.java | 9 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 184 +++++-
.../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 +
.../ExtendedStaggeredGridLayoutManager.java | 18 +
.../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 | 4 +-
.../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 +-
dangerfile.js | 164 +++--
doc/source/cn/references/components/input.md | 241 +++++--
doc/source/cn/references/components/list.md | 2 +-
doc/source/cn/references/modules/animation.md | 4 +-
doc/source/cn/references/modules/websocket.md | 2 +-
doc/source/cn/references/weex-variable.md | 4 +-
.../cn/v-0.10/references/components/input.md | 216 ++++++-
doc/source/guide/index.md | 6 +-
doc/source/references/components/input.md | 233 +++++--
doc/source/references/components/list.md | 2 +-
doc/source/references/modules/animation.md | 12 +-
doc/source/references/modules/websocket.md | 2 +-
doc/source/references/weex-variable.md | 4 +-
doc/themes/weex/languages/cn.yml | 12 +
doc/themes/weex/languages/en.yml | 13 +-
doc/themes/weex/layout/index.ejs | 28 +
doc/themes/weex/source/css/index.scss | 19 +-
doc/themes/weex/source/images/fliggy.png | Bin 0 -> 19329 bytes
doc/themes/weex/source/images/juhuasuan.png | Bin 0 -> 46340 bytes
doc/themes/weex/source/images/qianniu.png | Bin 0 -> 19852 bytes
doc/themes/weex/source/images/taopiaopiao.png | Bin 0 -> 12460 bytes
html5/render/vue/README.md | 23 +-
html5/render/vue/components/slider/index.js | 137 +---
.../render/vue/components/slider/slideMixin.js | 647 ++++++++++++++-----
.../vue/components/slider/slider-neighbor.css | 19 -
.../vue/components/slider/slider-neighbor.js | 116 +---
html5/render/vue/components/slider/slider.css | 34 +
html5/render/vue/core/style.js | 7 +-
html5/render/vue/env/viewport.js | 6 +-
html5/render/vue/index.js | 6 +
html5/render/vue/mixins/scrollable.js | 7 +-
html5/render/vue/modules/dom.js | 16 +-
html5/render/vue/utils/style.js | 85 ++-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 -
.../Sources/Component/WXCycleSliderComponent.m | 9 +-
.../Sources/Component/WXLoadingComponent.m | 7 -
.../Sources/Component/WXScrollerComponent.m | 5 +-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 15 +-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 7 -
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +-
ios/sdk/WeexSDK/dependency/SRWebSocket.h | 17 +-
ios/sdk/WeexSDK/dependency/SRWebSocket.m | 18 +-
ios/sdk/WeexSDKTests/WXURLRewriteTests.m | 21 -
ios/sdk/WeexSDKTests/dependency/libOCMock.a | Bin 2098920 -> 0 bytes
package.json | 2 +-
packages/weex-vue-render/README.md | 23 +-
packages/weex-vue-render/package.json | 2 +-
scripts/release_files.rules | 3 +-
test/pages/css/border.vue | 13 +-
test/screenshot/border-android.png | Bin 196752 -> 156247 bytes
test/screenshot/border-ios.png | Bin 161202 -> 128206 bytes
131 files changed, 3233 insertions(+), 1075 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d35a927f/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d35a927f/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 97bde40,6127599..92e177e
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@@ -336,9 -399,9 +400,12 @@@ public abstract class BasicListComponen
int accuracy = WXUtils.getInteger(param, 10);
setOffsetAccuracy(accuracy);
return true;
+ case Constants.Name.STABLE:
+ this.mStable = WXUtils.getBoolean(param, false);
+ return true;
+ case Constants.Name.DRAGGABLE:
+ boolean draggable = WXUtils.getBoolean(param,false);
+ setDraggable(draggable);
}
return super.setProperty(key, param);
}