You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/02/24 16:47:57 UTC
[09/50] incubator-weex git commit: Merge branch '0.11-dev' into
html5-feature-0.10-merge-0.11-dev
Merge branch '0.11-dev' into html5-feature-0.10-merge-0.11-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/e0493ea9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e0493ea9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e0493ea9
Branch: refs/heads/test-ci
Commit: e0493ea92b44f4aac574cddce439148e80baddf6
Parents: d3eb457 be9896c
Author: \u9690\u5c0f\u98ce <cx...@gmail.com>
Authored: Mon Feb 20 15:36:44 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Feb 20 15:36:44 2017 +0800
----------------------------------------------------------------------
.gitignore | 1 +
.travis.yml | 18 +-
Gemfile.lock | 10 +-
android/playground/app/build.gradle | 6 +-
android/run-ci.sh | 2 +-
.../java/com/taobao/weex/common/Constants.java | 4 +
.../com/taobao/weex/ui/WXRenderStatement.java | 14 +-
.../ui/component/AbstractEditComponent.java | 91 ++++++-
.../taobao/weex/ui/component/Scrollable.java | 4 +-
.../taobao/weex/ui/component/WXScroller.java | 43 +++-
.../ui/component/list/BasicListComponent.java | 70 +++--
.../weex/ui/view/border/BorderDrawable.java | 20 +-
.../taobao/weex/ui/view/border/BorderEdge.java | 6 +-
.../weex/ui/view/border/BorderRadiusType.java | 222 ++++++++++++++++
.../view/border/BorderWidthStyleColorType.java | 224 ++++++++++++++++
.../listview/ExtendedLinearLayoutManager.java | 256 +++++++++++++++++++
.../weex/ui/view/listview/WXRecyclerView.java | 3 +-
.../ui/component/list/WXListComponentTest.java | 19 +-
.../weex/ui/view/border/BorderDrawableTest.java | 4 +-
ios/playground/WeexDemo.app.zip | Bin 0 -> 2561323 bytes
ios/sdk/WeexSDK/Resources/main.js | 14 +-
.../WeexSDK/Sources/Component/WXCellComponent.h | 1 +
.../WeexSDK/Sources/Component/WXCellComponent.m | 5 +
.../WeexSDK/Sources/Component/WXListComponent.m | 35 ++-
.../Sources/Component/WXScrollerComponent.m | 4 +-
.../Sources/Component/WXSliderComponent.m | 4 +-
.../Sources/Component/WXTextAreaComponent.m | 28 ++
.../Sources/Component/WXTextInputComponent.m | 27 +-
.../Sources/Component/WXVideoComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 1 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 20 ++
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 6 +
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 67 +++--
.../Sources/View/WXComponent+ViewManagement.m | 4 +-
package.json | 6 +-
test/ci-funcs.sh | 110 ++++++++
test/pages/dom-operation.we | 32 +++
test/run.sh | 18 +-
test/scripts/components/list-scroll.test.js | 49 ----
test/scripts/components/scroll-event.test.js | 92 +++++++
test/scripts/components/scroller-scroll.test.js | 37 ---
test/scripts/dom.test.js | 73 ++++++
test/scripts/index.test.js | 14 +-
test/scripts/util.js | 18 +-
46 files changed, 1465 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e0493ea9/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e0493ea9/package.json
----------------------------------------------------------------------