You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/06/06 03:24:12 UTC
[3/3] incubator-weex git commit: Merge branch '0.14-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
ios-bugfix-0.14-dev
Merge branch '0.14-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-bugfix-0.14-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/b69f6123
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b69f6123
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b69f6123
Branch: refs/heads/0.14-dev
Commit: b69f6123dc1bc17ab1c63db17c1cbb1e8599cf36
Parents: f798852 217907e
Author: 齐山 <su...@163.com>
Authored: Tue Jun 6 11:22:15 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue Jun 6 11:22:15 2017 +0800
----------------------------------------------------------------------
.travis.yml | 3 +-
android/build.gradle | 8 +-
android/commons/build.gradle | 1 +
.../adapter/DefaultWebSocketAdapter.java | 54 ++++-
.../weex/commons/util/RequestIdGenerator.java | 15 ++
.../weex/commons/util/WSEventReporter.java | 192 ++++++++++++++++
android/playground/app/build.gradle | 2 +-
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../extend/adapter/InterceptWXHttpAdapter.java | 57 +++--
.../com/taobao/weex/bridge/WXBridgeManager.java | 45 ++--
.../com/taobao/weex/common/WXPerformance.java | 9 +-
.../ui/component/AbstractEditComponent.java | 16 +-
.../taobao/weex/ui/component/WXComponent.java | 23 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 3 +-
.../java/com/taobao/weex/WXSDKEngineTest.java | 1 -
dangerfile.js | 5 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 28 ++-
.../Sources/Controller/WXBaseViewController.m | 6 -
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
test/mocha.opts | 2 +-
test/pages/components/scroller-fixed.vue | 14 +-
test/pages/components/slider-common.vue | 229 +++++++++++++++++++
test/scripts/components/recycler.test.js | 12 +-
test/scripts/components/scroller-fixed.test.js | 5 +-
test/scripts/components/slider-common.test.js | 100 ++++++++
test/scripts/util.js | 28 ++-
27 files changed, 760 insertions(+), 103 deletions(-)
----------------------------------------------------------------------