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/01/24 08:21:23 UTC
[12/50] [abbrv] incubator-weex git commit: Merge remote-tracking
branch 'alibaba/ios-feature-20170118' into ios-feature-20170118
Merge remote-tracking branch 'alibaba/ios-feature-20170118' into ios-feature-20170118
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dcca37eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dcca37eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dcca37eb
Branch: refs/heads/master
Commit: dcca37eb472127d18b4e25fabb25033177f8cc01
Parents: 3f35b82 b25b16c
Author: \u9f50\u5c71 <su...@163.com>
Authored: Tue Jan 10 22:31:54 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Tue Jan 10 22:31:54 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Resources/main.js | 14 +++----
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 25 +++++-------
.../Sources/Component/WXImageComponent.m | 28 ++++++++++++-
.../WeexSDK/Sources/Component/WXListComponent.m | 6 +++
.../Sources/Component/WXScrollerComponent.h | 2 +
.../Sources/Component/WXScrollerComponent.m | 4 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 5 ++-
.../Sources/Display/WXComponent+Display.m | 6 ++-
.../WeexSDK/Sources/Events/WXComponent+Events.m | 25 +++++++++---
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
.../Sources/Manager/WXComponentManager.m | 15 +++++++
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 5 +++
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 6 ++-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 4 ++
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 43 ++++++++++++++++++--
.../Sources/Model/WXSDKInstance_private.h | 3 ++
.../WeexSDK/Sources/Module/WXAnimationModule.m | 20 ++++++++-
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 28 +++++++------
.../Sources/Protocol/WXNavigationProtocol.h | 31 +++++++++++---
19 files changed, 216 insertions(+), 56 deletions(-)
----------------------------------------------------------------------