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/05/16 03:18:22 UTC

[12/12] incubator-weex git commit: Merge branch '0.13-ios-prerender-1-dev' of https://github.com/kfeagle/incubator-weex into 0.13-dev

Merge branch '0.13-ios-prerender-1-dev' of https://github.com/kfeagle/incubator-weex into 0.13-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/eafb97f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eafb97f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eafb97f3

Branch: refs/heads/0.13-dev
Commit: eafb97f326465c5f7ccf8d40e9ca646dd9b51699
Parents: 8365535 7256aee
Author: cxfeng <cx...@apache.org>
Authored: Tue May 16 11:17:48 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Tue May 16 11:17:48 2017 +0800

----------------------------------------------------------------------
 ios/playground/WeexDemo/AppDelegate.m           |   4 +
 .../WeexDemo/WXConfigCenterDefaultImpl.h        |  25 ++
 .../WeexDemo/WXConfigCenterDefaultImpl.m        |  45 +++
 ios/playground/WeexDemo/WXDemoViewController.m  |  22 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |   8 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m    |   5 +
 .../Sources/Controller/WXBaseViewController.m   |  23 +-
 .../WeexSDK/Sources/Manager/WXBridgeManager.h   |   2 +
 .../Sources/Manager/WXComponentManager.h        |   2 +-
 .../Sources/Manager/WXComponentManager.m        |  28 +-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h   |   5 +
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |   6 +
 .../WeexSDK/Sources/Module/WXPrerenderManager.h |  88 ++++++
 .../WeexSDK/Sources/Module/WXPrerenderManager.m | 290 +++++++++++++++++++
 14 files changed, 548 insertions(+), 5 deletions(-)
----------------------------------------------------------------------