evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1184 from autresphere/master

Browse source 
Allow nested call to setImageWithURLRequest
This commit is contained in:
Mattt Thompson 2013-07-31 12:00:17 -07:00
commit 259c2c24af
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
AFNetworking/UIImageView+AFNetworking.m
View file

@ -101,13 +101,13 @@ static char kAFImageRequestOperationObjectKey;
UIImage *cachedImage = [[[self class] af_sharedImageCache] cachedImageForRequest:urlRequest]; UIImage *cachedImage = [[[self class] af_sharedImageCache] cachedImageForRequest:urlRequest];
if (cachedImage) { if (cachedImage) {
self.af_imageRequestOperation = nil;
if (success) { if (success) {
success(nil, nil, cachedImage); success(nil, nil, cachedImage);
} else { } else {
self.image = cachedImage; self.image = cachedImage;
} }
self.af_imageRequestOperation = nil;
} else { } else {
if (placeholderImage) { if (placeholderImage) {
self.image = placeholderImage; self.image = placeholderImage;
@ -116,27 +116,27 @@ static char kAFImageRequestOperationObjectKey;
AFImageRequestOperation *requestOperation = [[AFImageRequestOperation alloc] initWithRequest:urlRequest]; AFImageRequestOperation *requestOperation = [[AFImageRequestOperation alloc] initWithRequest:urlRequest];
[requestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) { [requestOperation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
if ([urlRequest isEqual:[self.af_imageRequestOperation request]]) { if ([urlRequest isEqual:[self.af_imageRequestOperation request]]) {
if (self.af_imageRequestOperation == operation) {
self.af_imageRequestOperation = nil;
}
if (success) { if (success) {
success(operation.request, operation.response, responseObject); success(operation.request, operation.response, responseObject);
} else if (responseObject) { } else if (responseObject) {
self.image = responseObject; self.image = responseObject;
} }
if (self.af_imageRequestOperation == operation) {
self.af_imageRequestOperation = nil;
}
} }
[[[self class] af_sharedImageCache] cacheImage:responseObject forRequest:urlRequest]; [[[self class] af_sharedImageCache] cacheImage:responseObject forRequest:urlRequest];
} failure:^(AFHTTPRequestOperation *operation, NSError *error) { } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
if ([urlRequest isEqual:[self.af_imageRequestOperation request]]) { if ([urlRequest isEqual:[self.af_imageRequestOperation request]]) {
if (failure) {
failure(operation.request, operation.response, error);
}
if (self.af_imageRequestOperation == operation) { if (self.af_imageRequestOperation == operation) {
self.af_imageRequestOperation = nil; self.af_imageRequestOperation = nil;
} }
if (failure) {
failure(operation.request, operation.response, error);
}
} }
}]; }];