You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/09 08:03:11 UTC
[1/2] incubator-weex git commit: * [ios] fix resourceloader load
local resource
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev ca211a54d -> f82e311a5
* [ios] fix resourceloader load local resource
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fbaab518
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fbaab518
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fbaab518
Branch: refs/heads/0.16-dev
Commit: fbaab5184e926b5465e739ba245b9593f2cd9582
Parents: 1ebd484
Author: acton393 <zh...@gmail.com>
Authored: Wed Aug 9 16:02:35 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Aug 9 16:02:35 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fbaab518/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m b/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
index 1f0fd0c..e3b58fd 100644
--- a/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
+++ b/ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m
@@ -87,7 +87,7 @@
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
NSData *fileData = [[NSFileManager defaultManager] contentsAtPath:[url path]];
if (self.onFinished) {
- self.onFinished([WXResourceResponse new], fileData);
+ self.onFinished([[WXResourceResponse alloc]initWithURL:url statusCode:200 HTTPVersion:@"1.1" headerFields:nil], fileData);
}
});
}
[2/2] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.16-dev
Posted by ac...@apache.org.
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.16-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/f82e311a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f82e311a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f82e311a
Branch: refs/heads/0.16-dev
Commit: f82e311a5cbbfccff1496dd1c3f37ddff431fb7a
Parents: fbaab51 ca211a5
Author: acton393 <zh...@gmail.com>
Authored: Wed Aug 9 16:02:59 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Aug 9 16:02:59 2017 +0800
----------------------------------------------------------------------
.../Component/Recycler/WXRecyclerComponent.m | 58 +++++-
.../Recycler/WXRecyclerDragController.h | 52 +++++
.../Recycler/WXRecyclerDragController.m | 208 +++++++++++++++++++
3 files changed, 312 insertions(+), 6 deletions(-)
----------------------------------------------------------------------