From 23874cdca4f1a250699e2f7609ab145b421ef861 Mon Sep 17 00:00:00 2001 From: Bogdan Poplauschi Date: Wed, 25 Jun 2014 11:24:59 +0300 Subject: [PATCH] Update for #771 - instead of removing the old methods, deprecated them so we are backwards compatible. --- SDWebImage/UIButton+WebCache.h | 2 ++ SDWebImage/UIButton+WebCache.m | 5 +++++ SDWebImage/UIImageView+WebCache.h | 2 ++ SDWebImage/UIImageView+WebCache.m | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/SDWebImage/UIButton+WebCache.h b/SDWebImage/UIButton+WebCache.h index 6a6fdc7..6830d4f 100644 --- a/SDWebImage/UIButton+WebCache.h +++ b/SDWebImage/UIButton+WebCache.h @@ -220,4 +220,6 @@ - (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:placeholderImage:completed:`"); - (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:placeholderImage:options:completed:`"); +- (void)cancelCurrentImageLoad __deprecated_msg("Use `cancelImageLoadForState:`"); + @end diff --git a/SDWebImage/UIButton+WebCache.m b/SDWebImage/UIButton+WebCache.m index f86b452..b4b3984 100644 --- a/SDWebImage/UIButton+WebCache.m +++ b/SDWebImage/UIButton+WebCache.m @@ -240,4 +240,9 @@ static char imageURLStorageKey; }]; } +- (void)cancelCurrentImageLoad { + // in a backwards compatible manner, cancel for current state + [self cancelImageLoadOperationWithKey:[NSString stringWithFormat:@"UIButtonImageOperation%@", @(self.state)]]; +} + @end diff --git a/SDWebImage/UIImageView+WebCache.h b/SDWebImage/UIImageView+WebCache.h index fb56d0b..ba6e264 100644 --- a/SDWebImage/UIImageView+WebCache.h +++ b/SDWebImage/UIImageView+WebCache.h @@ -173,4 +173,6 @@ - (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:options:completed:`"); - (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:options:progress:completed:`"); +- (void)cancelCurrentArrayLoad __deprecated_msg("Use `cancelCurrentAnimationImagesLoad`"); + @end diff --git a/SDWebImage/UIImageView+WebCache.m b/SDWebImage/UIImageView+WebCache.m index fb4285c..65112bf 100644 --- a/SDWebImage/UIImageView+WebCache.m +++ b/SDWebImage/UIImageView+WebCache.m @@ -172,4 +172,8 @@ static char imageURLKey; } +- (void)cancelCurrentArrayLoad { + [self cancelCurrentAnimationImagesLoad]; +} + @end