merge mine

heroims · May 28, 2015 · 8391fe5 · 8391fe5
1 parent 4fcc438
commit 8391fe5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/SDWebImage/UIButton+WebCache.m b/SDWebImage/UIButton+WebCache.m
@@ -83,7 +83,7 @@ - (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placehold
                     animation.type =kCATransitionFade;
                     [sself.layer addAnimation:animation forKey:@"fade"];
                 }
-
+                
                 [sself setImage:image forState:state];
             }
             if (completedBlock && finished) {
@@ -127,7 +127,7 @@ - (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state
                 __strong UIButton *sself = wself;
                 if (!sself) return;
                 if (image) {
-					if (cacheType==SDImageCacheTypeNone) {
+                    if (cacheType==SDImageCacheTypeNone) {
                         CATransition *animation = [CATransition animation];
                         animation.delegate = sself;
                         animation.duration = 1;

diff --git a/SDWebImage/UIImageView+WebCache.m b/SDWebImage/UIImageView+WebCache.m
@@ -63,6 +63,7 @@ - (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder
                         animation.type =kCATransitionFade;
                         [wself.layer addAnimation:animation forKey:@"fade"];
                     }
+
                     wself.image = image;
                     [wself setNeedsLayout];
                 } else {