From a5d53b3eef5e8c8c379d24a94b9bd331bb5c58ef Mon Sep 17 00:00:00 2001 From: iska Date: Sun, 7 Jun 2015 00:08:40 +0200 Subject: [PATCH] Fix acceptNode method in the selector's implementation after merge with new DOM --- HTMLKit/CSSAttributeSelector.m | 6 +++--- HTMLKit/CSSSelector.m | 4 ++-- HTMLKit/CSSSimpleSequence.m | 6 +++--- HTMLKit/CSSTypeSelector.m | 6 +++--- HTMLKit/HTMLDocumentFragment.m | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HTMLKit/CSSAttributeSelector.m b/HTMLKit/CSSAttributeSelector.m index 96d0247..3cf8a80 100644 --- a/HTMLKit/CSSAttributeSelector.m +++ b/HTMLKit/CSSAttributeSelector.m @@ -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; diff --git a/HTMLKit/CSSSelector.m b/HTMLKit/CSSSelector.m index dfd73f3..7f624ec 100644 --- a/HTMLKit/CSSSelector.m +++ b/HTMLKit/CSSSelector.m @@ -23,10 +23,10 @@ return nil; } -- (BOOL)acceptNode:(HTMLNode *)node +- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node { [self doesNotRecognizeSelector:_cmd]; - return NO; + return HTMLNodeFilterSkip; } @end diff --git a/HTMLKit/CSSSimpleSequence.m b/HTMLKit/CSSSimpleSequence.m index 5168e46..e651bb6 100644 --- a/HTMLKit/CSSSimpleSequence.m +++ b/HTMLKit/CSSSimpleSequence.m @@ -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 diff --git a/HTMLKit/CSSTypeSelector.m b/HTMLKit/CSSTypeSelector.m index 2c06df8..72e0741 100644 --- a/HTMLKit/CSSTypeSelector.m +++ b/HTMLKit/CSSTypeSelector.m @@ -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]]; diff --git a/HTMLKit/HTMLDocumentFragment.m b/HTMLKit/HTMLDocumentFragment.m index adcde5e..2f2d5a2 100644 --- a/HTMLKit/HTMLDocumentFragment.m +++ b/HTMLKit/HTMLDocumentFragment.m @@ -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]]; }