You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/20 11:41:42 UTC
[05/17] incubator-weex git commit: Merge branch '0.11-dev' into
android-feature-20170307-jsc
Merge branch '0.11-dev' into android-feature-20170307-jsc
# Conflicts:
# android/sdk/assets/main.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fb14c5fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fb14c5fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fb14c5fe
Branch: refs/heads/0.12-dev
Commit: fb14c5fe620c030e9951175df7f40eee35da87d3
Parents: 571519c 373ae38
Author: zshshr <zh...@gmail.com>
Authored: Mon Mar 27 14:34:29 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Mar 27 14:34:29 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++---
.../ui/component/list/BasicListComponent.java | 2 +-
html5/frameworks/legacy/app/ctrl/init.js | 2 +
html5/shared/freeze.js | 47 ++++++++++++--------
ios/sdk/WeexSDK/Resources/main.js | 14 +++---
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.h | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 4 ++
.../Sources/Component/WXRefreshComponent.m | 2 +-
.../Sources/Component/WXSliderComponent.m | 6 +--
package.json | 2 +-
11 files changed, 57 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fb14c5fe/html5/frameworks/legacy/app/ctrl/init.js
----------------------------------------------------------------------