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:37 UTC
[26/50] [abbrv] incubator-weex git commit: Merge branch
'ios-feature-20170118' into ios-feature-20170118
Merge branch '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/21cc795a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/21cc795a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/21cc795a
Branch: refs/heads/master
Commit: 21cc795af2ca2703bb0cdfcdbf8799df291ee8bb
Parents: fdf5ed7 2cebd32
Author: \u9690\u5c0f\u98ce <cx...@gmail.com>
Authored: Wed Jan 11 11:53:12 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Jan 11 11:53:12 2017 +0800
----------------------------------------------------------------------
examples/module/websocket-demo.we | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 16 +++----
.../Sources/Component/WXImageComponent.m | 24 ++++------
.../Sources/Component/WXTextAreaComponent.m | 39 +++++++++--------
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 +
.../Sources/Component/WXTextInputComponent.m | 14 +++---
.../Sources/Display/WXComponent+Display.m | 6 +--
.../WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
.../Sources/Manager/WXComponentManager.m | 2 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 6 ++-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 46 ++++++++++++++++++--
.../Sources/Model/WXSDKInstance_private.h | 3 ++
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 28 +++++++-----
.../Sources/Protocol/WXNavigationProtocol.h | 31 ++++++++++---
16 files changed, 143 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/21cc795a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------