ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-17 03:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slight naming adjustments for recent ASMultiplexImageNode additions

Browse Source
This commit is contained in:
andyscott 2015-01-21 22:30:24 -08:00
parent 60b27829e1
commit 11e3cf518c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/ASMultiplexImageNode.h
View File

@ -71,7 +71,7 @@ typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) {
/** /**
* @abstract Indicates that the receiver should stop loading if it encounters an error while loading an intermediate image identifier. Defaults to NO. * @abstract Indicates that the receiver should stop loading if it encounters an error while loading an intermediate image identifier. Defaults to NO.
*/ */
@property (nonatomic, readwrite, assign) BOOL haltLoadingOnError; @property (nonatomic, readwrite, assign) BOOL haltsLoadingOnError;
/** /**
* @abstract An array of identifiers representing various versions of an image for ASMultiplexImageNode to display. * @abstract An array of identifiers representing various versions of an image for ASMultiplexImageNode to display.

12
AsyncDisplayKit/ASMultiplexImageNode.mm
View File

@ -62,7 +62,7 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
// Image flags. // Image flags.
BOOL _downloadsIntermediateImages; // Defaults to NO. BOOL _downloadsIntermediateImages; // Defaults to NO.
BOOL _haltLoadingOnError; // Defaults to NO. BOOL _haltsLoadingOnError; // Defaults to NO.
OSSpinLock _imageIdentifiersLock; OSSpinLock _imageIdentifiersLock;
NSArray *_imageIdentifiers; NSArray *_imageIdentifiers;
id _loadedImageIdentifier; id _loadedImageIdentifier;
@ -355,11 +355,11 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
{ {
OSSpinLockLock(&_imageIdentifiersLock); OSSpinLockLock(&_imageIdentifiersLock);
id _currentImageIdentifier = _failedImageIdentifier != nil ? _failedImageIdentifier : _loadedImageIdentifier; id currentImageIdentifier = _failedImageIdentifier != nil ? _failedImageIdentifier : _loadedImageIdentifier;
// If we've already loaded the best identifier, we've got nothing else to do. // If we've already loaded the best identifier, we've got nothing else to do.
id bestImageIdentifier = ([_imageIdentifiers count] > 0) ? _imageIdentifiers[0] : nil; id bestImageIdentifier = ([_imageIdentifiers count] > 0) ? _imageIdentifiers[0] : nil;
if (!bestImageIdentifier || [_currentImageIdentifier isEqual:bestImageIdentifier]) { if (!bestImageIdentifier || [currentImageIdentifier isEqual:bestImageIdentifier]) {
OSSpinLockUnlock(&_imageIdentifiersLock); OSSpinLockUnlock(&_imageIdentifiersLock);
return nil; return nil;
} }
@ -372,7 +372,7 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
} }
// Otherwise, load progressively. // Otherwise, load progressively.
else { else {
NSUInteger currentIndex = [_imageIdentifiers indexOfObject:_currentImageIdentifier]; NSUInteger currentIndex = [_imageIdentifiers indexOfObject:currentImageIdentifier];
// If nothing has loaded yet, load the worst identifier. // If nothing has loaded yet, load the worst identifier.
if (currentIndex == NSNotFound) { if (currentIndex == NSNotFound) {
@ -592,10 +592,10 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
#pragma mark - #pragma mark -
- (void)_finishedLoadingImage:(UIImage *)image forIdentifier:(id)imageIdentifier error:(NSError *)error - (void)_finishedLoadingImage:(UIImage *)image forIdentifier:(id)imageIdentifier error:(NSError *)error
{ {
// If we failed to load and _haltLoadingOnError is YES, we stop the loading process. // If we failed to load and _haltsLoadingOnError is YES, we stop the loading process.
// Note that if we bailed before we began downloading because the best identifier changed, we don't bail, but rather just begin loading the best image identifier. // Note that if we bailed before we began downloading because the best identifier changed, we don't bail, but rather just begin loading the best image identifier.
if (error && error.code != ASMultiplexImageNodeErrorCodeBestImageIdentifierChanged) { if (error && error.code != ASMultiplexImageNodeErrorCodeBestImageIdentifierChanged) {
if (_haltLoadingOnError) { if (_haltsLoadingOnError) {
return; return;
} }
_failedImageIdentifier = imageIdentifier; _failedImageIdentifier = imageIdentifier;