Fix acceptNode method in the selector's implementation after merge with new DOM

This commit is contained in:
iska
2015-06-07 00:08:40 +02:00
parent 5e5b903c52
commit a5d53b3eef
5 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -43,10 +43,10 @@
return self;
}
- (BOOL)acceptNode:(HTMLNode *)node
- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node
{
if (node.type != HTMLNodeElement) {
return NO;
if (node.nodeType != HTMLNodeElement) {
return HTMLNodeFilterSkip;
}
HTMLElement *element = (HTMLElement *)node;
+2 -2
View File
@@ -23,10 +23,10 @@
return nil;
}
- (BOOL)acceptNode:(HTMLNode *)node
- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node
{
[self doesNotRecognizeSelector:_cmd];
return NO;
return HTMLNodeFilterSkip;
}
@end
+3 -3
View File
@@ -50,14 +50,14 @@
[_selectors addObject:selector];
}
- (BOOL)acceptNode:(HTMLNode *)node
- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node
{
for (CSSSelector *selector in _selectors) {
if (![selector acceptNode:node]) {
return NO;
return HTMLNodeFilterSkip;
}
}
return YES;
return HTMLNodeFilterAccept;
}
@end
+3 -3
View File
@@ -37,10 +37,10 @@
return self;
}
- (BOOL)acceptNode:(HTMLNode *)node
- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node
{
if (node.type != HTMLNodeElement) {
return NO;
if (node.nodeType != HTMLNodeElement) {
return HTMLNodeFilterSkip;
}
return [_type isEqualToString:@"*"] || [_type isEqualToStringIgnoringCase:[(HTMLElement *)node tagName]];
+1 -1
View File
@@ -32,7 +32,7 @@
- (NSString *)textContent
{
NSMutableString *content = [NSMutableString string];
for (HTMLNode *node in self.treeEnumerator) {
for (HTMLNode *node in self.nodeIterator) {
if (node.nodeType == HTMLNodeText) {
[content appendString:[(HTMLText *)node data]];
}