qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 23:44:39 -07:00
Code Releases Activity

html: stop at scope marker node when generating implied </a> tags

Browse Source 
A <a> tag generates implied end tags for any open <a> elements.
But it shouldn't do that when it is inside a table cell the the open <a>
is outside the table.
So stop the search for an open <a> when we reach a scope marker node.

Pass tests1.dat, test 78:
<a href="blah">aba<table><tr><td><a href="foo">br</td></tr>x</table>aoe

| <html>
|   <head>
|   <body>
|     <a>
|       href="blah"
|       "abax"
|       <table>
|         <tbody>
|           <tr>
|             <td>
|               <a>
|                 href="foo"
|                 "br"
|       "aoe"

Also pass test 79:
<table><a href="blah">aba<tr><td><a href="foo">br</td></tr>x</table>aoe

R=nigeltao
CC=golang-dev
https://golang.org/cl/5320063
This commit is contained in:
Andrew Balholm 2011-11-02 11:47:05 +11:00 committed by Nigel Tao
parent 90b76c0f3e
commit 22ee5ae25a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/html/node.go
View File

@ -135,6 +135,8 @@ func (s *nodeStack) remove(n *Node) {
*s = (*s)[:j] *s = (*s)[:j]
} }
// TODO(nigeltao): forTag no longer used. Should it be deleted?
// forTag returns the top-most element node with the given tag. // forTag returns the top-most element node with the given tag.
func (s *nodeStack) forTag(tag string) *Node { func (s *nodeStack) forTag(tag string) *Node {
for i := len(*s) - 1; i >= 0; i-- { for i := len(*s) - 1; i >= 0; i-- {

11
src/pkg/html/parse.go
View File

@ -553,10 +553,13 @@ func inBodyIM(p *parser) (insertionMode, bool) {
} }
p.addElement(p.tok.Data, p.tok.Attr) p.addElement(p.tok.Data, p.tok.Attr)
case "a": case "a":
if n := p.afe.forTag("a"); n != nil { for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
p.inBodyEndTagFormatting("a") if n := p.afe[i]; n.Type == ElementNode && n.Data == "a" {
p.oe.remove(n) p.inBodyEndTagFormatting("a")
p.afe.remove(n) p.oe.remove(n)
p.afe.remove(n)
break
}
} }
p.reconstructActiveFormattingElements() p.reconstructActiveFormattingElements()
p.addFormattingElement(p.tok.Data, p.tok.Attr) p.addFormattingElement(p.tok.Data, p.tok.Attr)

2
src/pkg/html/parse_test.go
View File

@ -132,7 +132,7 @@ func TestParser(t *testing.T) {
rc := make(chan io.Reader) rc := make(chan io.Reader)
go readDat(filename, rc) go readDat(filename, rc)
// TODO(nigeltao): Process all test cases, not just a subset. // TODO(nigeltao): Process all test cases, not just a subset.
for i := 0; i < 78; i++ { for i := 0; i < 80; i++ {
// Parse the #data section. // Parse the #data section.
b, err := ioutil.ReadAll(<-rc) b, err := ioutil.ReadAll(<-rc)
if err != nil { if err != nil {