mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #780 from rokgregoric/master 

Do not load placeholder image if SDWebImageDelayPlaceholder option specified.
This commit is contained in:
Bogdan Poplauschi 2014-06-24 18:29:09 +03:00
parent 50c4d1d2eb 8d668b4121
commit 3a7adbbacf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDWebImage/UIImageView+WebCache.m
View File

@ -42,8 +42,7 @@ static char operationArrayKey;
- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock {
[self cancelCurrentImageLoad];
objc_setAssociatedObject(self, &imageURLKey, url, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
self.image = placeholder;
if (!(options & SDWebImageDelayPlaceholder)) {
self.image = placeholder;
}