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/05/18 09:50:20 UTC
[3/4] incubator-weex git commit: Merge branch '0.13-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.13-dev
Merge branch '0.13-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.13-dev
* '0.13-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex: (26 commits)
* [android] fix NPE in sticky header
* [ios] fix nsurl to nsstring value
* [ios] update iconfont demo for vue version
* [ios] update iconfont for vue
* [ios] add iconfont to for index
* [ios] update iconfont case
* [ios] use resource handler download iconfont
* [ios] add config settings for WeexDemo
+ [ios] update wxprerendermanager
+ [ios] update wxprerendermanager.h
* [test] update gitignore in screenshot
* [test] update screenshot
+ [ios] add comment for function and move prerender module
+ [ios] update config
+ [ios] format (
+ [ios] update weexsdk compile error
+ [ios] change to class method
* [test] Update border case for android.
+ [ios] update pretender manager
+ [ios] update pretender
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/89152a36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/89152a36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/89152a36
Branch: refs/heads/0.13-dev
Commit: 89152a36e381fc18d5de98cffc56d2250f62091a
Parents: 38d375f 7a676ef
Author: zshshr <zh...@gmail.com>
Authored: Wed May 17 11:59:49 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed May 17 11:59:49 2017 +0800
----------------------------------------------------------------------
.../weex/extend/module/WXEventModule.java | 18 ++
.../ui/component/list/StickyHeaderHelper.java | 2 +-
examples/iconfont.we | 63 +++-
examples/index.we | 1 +
examples/vue/iconfont.vue | 80 +++--
examples/vue/index.vue | 3 +-
.../WeexDemo.xcodeproj/project.pbxproj | 6 +
ios/playground/WeexDemo/AppDelegate.m | 4 +
.../WeexDemo/WXConfigCenterDefaultImpl.h | 25 ++
.../WeexDemo/WXConfigCenterDefaultImpl.m | 45 +++
ios/playground/WeexDemo/WXDemoViewController.m | 22 +-
.../WeexDemo/extend/module/WXEventModule.m | 16 +
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 | 292 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 82 +++---
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +
test/.gitignore | 3 +-
test/pages/modules/globalEvent.vue | 48 +++
test/screenshot/border-android.png | Bin 0 -> 196752 bytes
test/scripts/css/border.test.js | 4 -
test/scripts/modules/globalEvent.test.js | 60 ++++
29 files changed, 857 insertions(+), 86 deletions(-)
----------------------------------------------------------------------