Skip to content

Commit 763e811

Browse files
committed
Fix merge issues.
1 parent 557986f commit 763e811

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

ios/FastImage/FFFastImageView.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ - (void)setResizeMode:(RCTResizeMode)resizeMode
1616

1717
- (void)setOnFastImageLoadEnd:(RCTBubblingEventBlock)onFastImageLoadEnd {
1818
_onFastImageLoadEnd = onFastImageLoadEnd;
19-
2019
if (hasCompleted) {
2120
_onFastImageLoadEnd(@{});
2221
}
@@ -29,7 +28,6 @@ - (void)setOnFastImageLoad:(RCTBubblingEventBlock)onFastImageLoad {
2928
}
3029
}
3130

32-
3331
- (void)setOnFastImageError:(RCTDirectEventBlock)onFastImageError {
3432
_onFastImageError = onFastImageError;
3533
if (hasErrored) {
@@ -50,9 +48,6 @@ - (void)setOnFastImageLoadStart:(RCTBubblingEventBlock)onFastImageLoadStart {
5048

5149
- (void)setSource:(FFFastImageSource *)source {
5250
if (_source != source) {
53-
isComplete = NO;
54-
hasError = NO;
55-
5651
_source = source;
5752

5853
// Set headers.
@@ -99,7 +94,6 @@ - (void)setSource:(FFFastImageSource *)source {
9994
NSError * _Nullable error,
10095
SDImageCacheType cacheType,
10196
NSURL * _Nullable imageURL) {
102-
isComplete = YES;
10397
if (error) {
10498
hasErrored = YES;
10599
if (_onFastImageError) {

0 commit comments

Comments
 (0)