ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-21 13:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ASNodeValidForAccessibility

Browse Source
This commit is contained in:
Michael Schneider 2016-04-07 10:55:04 -07:00
parent f3303c1fb8
commit 34df512eeb
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
AsyncDisplayKit/Details/_ASDisplayView.mm
View File

@ -382,22 +382,6 @@
#pragma mark - Accessibility #pragma mark - Accessibility
static BOOL ASNodeValidForAccessibility(ASDisplayNode *node)
{
if (node.isAccessibilityElement) {
return YES;
}
if (node.isLayerBacked) {
// Assume for now that all nodes that have an accessibility label or
return node.accessibilityLabel.length > 0 ||
node.accessibilityValue.length > 0 ||
((node.accessibilityTraits & UIAccessibilityTraitNone) != UIAccessibilityTraitNone);
}
return NO;
}
static const char *ASDisplayNodeAssociatedNodeKey = "ASAssociatedNode"; static const char *ASDisplayNodeAssociatedNodeKey = "ASAssociatedNode";
@implementation UIAccessibilityElement (_ASDisplayView) @implementation UIAccessibilityElement (_ASDisplayView)
@ -449,7 +433,7 @@ static const char *ASDisplayNodeAssociatedNodeKey = "ASAssociatedNode";
queue.pop(); queue.pop();
// Check if we have to add the node to the accessiblity nodes as it's an accessiblity element // Check if we have to add the node to the accessiblity nodes as it's an accessiblity element
if (node != selfNode && ASNodeValidForAccessibility(node)) { if (node != selfNode && node.isAccessibilityElement) {
UIAccessibilityElement *accessibilityElement = [[UIAccessibilityElement alloc] initWithAccessibilityContainer:self]; UIAccessibilityElement *accessibilityElement = [[UIAccessibilityElement alloc] initWithAccessibilityContainer:self];
accessibilityElement.asyncdisplaykit_node = node; accessibilityElement.asyncdisplaykit_node = node;
[_accessibleElements addObject:accessibilityElement]; [_accessibleElements addObject:accessibilityElement];
@ -469,7 +453,7 @@ static const char *ASDisplayNodeAssociatedNodeKey = "ASAssociatedNode";
if (!subnode.isAccessibilityElement && [subnode accessibilityElementCount] > 0) { if (!subnode.isAccessibilityElement && [subnode accessibilityElementCount] > 0) {
// We are good and the view is an UIAccessibilityContainer so add that // We are good and the view is an UIAccessibilityContainer so add that
[_accessibleElements addObject:subnode.view]; [_accessibleElements addObject:subnode.view];
} else if (ASNodeValidForAccessibility(subnode)) { } else if (subnode.isAccessibilityElement) {
// Create a accessiblity element from the subnode // Create a accessiblity element from the subnode
UIAccessibilityElement *accessibilityElement = [[UIAccessibilityElement alloc] initWithAccessibilityContainer:self]; UIAccessibilityElement *accessibilityElement = [[UIAccessibilityElement alloc] initWithAccessibilityContainer:self];
accessibilityElement.asyncdisplaykit_node = subnode; accessibilityElement.asyncdisplaykit_node = subnode;