GitHub/HTMLKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a shorthand element-in-scope method to match the spec

Browse Source 
"has-element-in-scope" is a shorthand for "has-element-in-specific-scope"
This commit is contained in:
iska
2015-03-10 00:31:08 +01:00
parent cf259240ab
commit 10506550dd
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HTMLKit/HTMLParser.m
+4 -4
View File
@@ -545,7 +545,7 @@
return YES;
}
if (![_stackOfOpenElements hasElementInSpecificScopeWithTagName:formattingElement.tagName]) {
if (![_stackOfOpenElements hasElementInScopeWithTagName:formattingElement.tagName]) {
[self emitParseError:@"Formatting element is not in scope"];
return YES;
}
@@ -1094,7 +1094,7 @@
[self insertElementForToken:token];
_tokenizer.state = HTMLTokenizerStatePLAINTEXT;
} else if ([tagName isEqualToString:@"button"]) {
if ([_stackOfOpenElements hasElementInSpecificScopeWithTagName:@"button"]) {
if ([_stackOfOpenElements hasElementInScopeWithTagName:@"button"]) {
[self emitParseError:@"Unexpected nested Start Tag (button) tag in <body>"];
[_stackOfOpenElements popElementsUntilElementPoppedWithTagName:@"button"];
}
@@ -1130,7 +1130,7 @@
[_listOfActiveFormattingElements addObject:element];
} else if ([tagName isEqualToString:@"nobr"]) {
[self reconstructActiveFormattingElements];
if ([_stackOfOpenElements hasElementInSpecificScopeWithTagName:@"nobr"]) {
if ([_stackOfOpenElements hasElementInScopeWithTagName:@"nobr"]) {
[self emitParseError:@"Unexpected nested Start Tag (nobr) in <body>"];
if (![self performAdoptionAgencyAlgorithmForTagName:@"nobr"]) {
#warning Handle Any Other End Tag Token
@@ -1266,7 +1266,7 @@
[self reconstructActiveFormattingElements];
[self insertElementForToken:token];
} else if ([tagName isEqualToAny:@"rp", @"rt", nil]) {
if ([_stackOfOpenElements hasElementInSpecificScopeWithTagName:@"ruby"]) {
if ([_stackOfOpenElements hasElementInScopeWithTagName:@"ruby"]) {
[self generateImpliedEndTagsExceptForElement:nil];
if (![self.currentNode.tagName isEqualToString:@"ruby"]) {
[self emitParseError:@"Unexpected Start Tag Token (%@) not in <ruby> in <body>", tagName];
HTMLKit/HTMLStackOfOpenElements.h
+3 -1
View File
@@ -30,7 +30,9 @@
- (void)popElementsUntilElementPoppedWithTagName:(NSString *)tagName;
- (void)popElementsUntilElementPopped:(HTMLElement *)element;
- (HTMLElement *)hasElementInSpecificScopeWithTagName:(NSString *)tagName;
- (void)popAll;
- (HTMLElement *)hasElementInScopeWithTagName:(NSString *)tagName;
- (HTMLElement *)hasElementInListItemScopeWithTagName:(NSString *)tagName;
- (HTMLElement *)hasElementInButtonScopeWithTagName:(NSString *)tagName;
- (HTMLElement *)hasElementInTableScopeWithTagName:(NSString *)tagName;
HTMLKit/HTMLStackOfOpenElements.m
+6 -1
View File
@@ -128,9 +128,14 @@
[_stack removeLastObject];
}
- (void)popAll
{
[_stack removeAllObjects];
}
#pragma mark - Element Scope
- (HTMLElement *)hasElementInSpecificScopeWithTagName:(NSString *)tagName
- (HTMLElement *)hasElementInScopeWithTagName:(NSString *)tagName;
{
return [self hasElementInSpecificScopeWithTagName:tagName andElementTypes:_specificScopeElementTypes];
}