Merge branch 'develop' of https://github.com/CatchChat/Yep into develop

This commit is contained in:
kevinzhow
2015-12-13 12:24:05 +08:00
2 changed files with 5 additions and 7 deletions
+3 -3
View File
@@ -13,7 +13,7 @@ PODS:
- FXBlurView (1.6.4)
- JPush-iOS-SDK (1.8.8)
- KeyboardMan (0.5.2)
- Kingfisher (1.8.3)
- Kingfisher (1.8.4)
- MonkeyKing (0.0.2)
- MZFayeClient (1.0.1):
- Base64 (~> 1.0.1)
@@ -53,7 +53,7 @@ DEPENDENCIES:
EXTERNAL SOURCES:
MZFayeClient:
:path: "../CatchLib-iOS/MZFayeClient/"
:path: ../CatchLib-iOS/MZFayeClient/
SPEC CHECKSUMS:
1PasswordExtension: a22573ad528dd63bd79c1f3b3813b17c2f86b91b
@@ -67,7 +67,7 @@ SPEC CHECKSUMS:
FXBlurView: db786c2561cb49a09ae98407f52460096ab8a44f
JPush-iOS-SDK: d4c097d8abbdd0837e24d44b41aacf64a6feddfd
KeyboardMan: b081c254c5c0adc794a49b4e97a86cb4ac917a66
Kingfisher: ead91e9dbeb7e5a2e8b7af3bd8a294104cbcc3f9
Kingfisher: e5a5e1660822b16580fd7ac79d69d6328190daf0
MonkeyKing: 9be24307843a80f4cd3eca66adc12c67aefb83bb
MZFayeClient: 65e7ef67e61fbe7a7a8b196130541c9f06bcb5d8
Navi: 24f5c81aeb46b89d27168ec1d459581230ae2675
@@ -352,10 +352,8 @@ class FeedSocialWorkCell: FeedBasicCell {
}
if let URL = socialWorkImageURL {
// nix PR https://github.com/onevcat/Kingfisher/pull/171
// MediaOptionsInfos decode Kingfisher GIF images
socialWorkImageView.kf_setImageWithURL(URL, placeholderImage: nil)
//socialWorkImageView.kf_setImageWithURL(URL, placeholderImage: nil, optionsInfo: MediaOptionsInfos)
// ref https://github.com/onevcat/Kingfisher/pull/171
socialWorkImageView.kf_setImageWithURL(URL, placeholderImage: nil, optionsInfo: MediaOptionsInfos)
}
}