Fix acceptNode method in the selector's implementation after merge with new DOM
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -23,10 +23,10 @@
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (BOOL)acceptNode:(HTMLNode *)node
|
||||
- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node
|
||||
{
|
||||
[self doesNotRecognizeSelector:_cmd];
|
||||
return NO;
|
||||
return HTMLNodeFilterSkip;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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]];
|
||||
|
||||
@@ -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]];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user