You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/06 11:10:15 UTC
[09/12] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Merge remote-tracking branch 'upstream/0.11-dev' into 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/610c3f1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/610c3f1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/610c3f1b
Branch: refs/heads/0.11-dev
Commit: 610c3f1b5e8614af920842f52f234c0cc3a83a42
Parents: a9f38b8 7706e8a
Author: \u9690\u98ce <yi...@alibaba-inc.com>
Authored: Mon Mar 6 12:11:20 2017 +0800
Committer: \u9690\u98ce <yi...@alibaba-inc.com>
Committed: Mon Mar 6 12:11:20 2017 +0800
----------------------------------------------------------------------
.../ui/component/AbstractEditComponent.java | 18 +++++--
.../taobao/weex/ui/component/WXComponent.java | 13 ++++-
.../ui/view/refresh/wrapper/BaseBounceView.java | 55 +++++++++++---------
.../WeexSDK/Sources/Module/WXStorageModule.m | 2 +-
ios/sdk/WeexSDKTests/WXStorageTests.m | 2 -
5 files changed, 55 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/610c3f1b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
----------------------------------------------------------------------