Merge branch 'master' of https://github.com/kerrmarin/PINRemoteImage into kerrmarin-master

This commit is contained in:
Garrett Moon
2015-10-06 16:14:46 -07:00
3 changed files with 13 additions and 2 deletions

View File

@@ -217,6 +217,10 @@
- (void)pin_clearImages;
- (BOOL)pin_ignoreGIFs;
@optional
- (PINRemoteImageManagerDownloadOptions)pin_defaultOptions;
@end
/**

View File

@@ -172,7 +172,14 @@
if (placeholderImage) {
[view pin_setPlaceholderWithImage:placeholderImage];
}
PINRemoteImageManagerDownloadOptions options = PINRemoteImageManagerDownloadOptionsNone;
PINRemoteImageManagerDownloadOptions options;
if([view respondsToSelector:@selector(pin_defaultOptions)]) {
options = [view pin_defaultOptions];
} else {
options = PINRemoteImageManagerDownloadOptionsNone;
}
if ([view pin_ignoreGIFs]) {
options |= PINRemoteImageManagerDownloadOptionsIgnoreGIFs;
}