Skip to content

Commit b8d5730

Browse files
author
lweintraub
committed
LayoutTests:
 Reviewed by eric. - http://bugzilla.opendarwin.org/show_bug.cgi?id=8393 <br>s created by createMarkup aren't valid xhtml Changes in case from innerHTML * editing/execCommand/createLink-expected.txt: * editing/execCommand/unlink-expected.txt: * editing/input/attributed-substring-from-range-lines-expected.txt: * fast/dom/Range/range-exceptions-expected.txt: * fast/dom/Range/resources/range-exceptions.js: * fast/innerHTML/005-expected.txt: * fast/innerHTML/innerHTML-custom-tag-expected.txt: * fast/innerHTML/innerHTML-cast.html: Added. * fast/innerHTML/innerHTML-cast-expected.txt: Added. * fast/xsl/xslt-processer-expected.txt: WebCore: Reviewed by Eric. - Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8393 <br>s created by createMarkup aren't valid xhtml Fixed uppered output from innerHTML * editing/markup.cpp: (WebCore::startMarkup): (WebCore::endMarkup): Canonical link: https://commits.webkit.org/12243@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14516 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent b68576c commit b8d5730

13 files changed

Lines changed: 105 additions & 38 deletions

‎LayoutTests/ChangeLog‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
2006-05-22 Levi Weintraub <lweintraub@apple.com>
2+
3+
Reviewed by eric.
4+
5+
- http://bugzilla.opendarwin.org/show_bug.cgi?id=8393
6+
<br>s created by createMarkup aren't valid xhtml
7+
Changes in case from innerHTML
8+
9+
* editing/execCommand/createLink-expected.txt:
10+
* editing/execCommand/unlink-expected.txt:
11+
* editing/input/attributed-substring-from-range-lines-expected.txt:
12+
* fast/dom/Range/range-exceptions-expected.txt:
13+
* fast/dom/Range/resources/range-exceptions.js:
14+
* fast/innerHTML/005-expected.txt:
15+
* fast/innerHTML/innerHTML-custom-tag-expected.txt:
16+
* fast/innerHTML/innerHTML-cast.html: Added.
17+
* fast/innerHTML/innerHTML-cast-expected.txt: Added.
18+
* fast/xsl/xslt-processer-expected.txt:
19+
120
2006-05-20 Anders Carlsson <acarlsson@apple.com>
221

322
Reviewed by Geoff.

‎LayoutTests/editing/execCommand/createLink-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Item 2
5252
This line contains an image.
5353
innerHTML of editable regions after the test:
5454

55-
<A href="http://www.google.com/">This paragraph starts unlinked. The entire paragraph should end up being a link to google.com.</A>
56-
<A href="http://www.apple.com/">This</A><A href="http://www.google.com/"> paragraph</A><A href="http://www.apple.com/"> starts out as a link to apple.com. The second word in the paragraph should end up being a link to google.com.</A>
57-
<A href="http://www.apple.com/">This</A><A href="http://www.google.com/"> paragraph</A><A href="http://www.apple.com/"> starts out as a link to apple.com. The second word in the paragraph should end up being a link to google.com.</A>
58-
<P><A href="http://www.google.com/">This </A><I><A href="http://www.google.com/">editable region</A></I><A href="http://www.google.com/"> contains lists, tables, styled text, and images. The entire region should end up being a link to google.com.</A></P> <UL> <LI><A href="http://www.google.com/">Item 1</A></LI> <LI><A href="http://www.google.com/">Item 2</A></LI> </UL> <TABLE border="1"><TBODY><TR><TD><A href="http://www.google.com/">1</A></TD><TD><A href="http://www.google.com/">2</A></TD><TD><A href="http://www.google.com/">3</A></TD></TR></TBODY></TABLE> <A href="http://www.google.com/"><BR> This </A><B><A href="http://www.google.com/">line</A></B><A href="http://www.google.com/"> contains </A><A href="http://www.google.com/"><IMG src="../resources/abe.jpg"> an image. </A>
55+
<a href="http://www.google.com/">This paragraph starts unlinked. The entire paragraph should end up being a link to google.com.</a>
56+
<a href="http://www.apple.com/">This</a><a href="http://www.google.com/"> paragraph</a><a href="http://www.apple.com/"> starts out as a link to apple.com. The second word in the paragraph should end up being a link to google.com.</a>
57+
<a href="http://www.apple.com/">This</a><a href="http://www.google.com/"> paragraph</a><a href="http://www.apple.com/"> starts out as a link to apple.com. The second word in the paragraph should end up being a link to google.com.</a>
58+
<p><a href="http://www.google.com/">This </a><i><a href="http://www.google.com/">editable region</a></i><a href="http://www.google.com/"> contains lists, tables, styled text, and images. The entire region should end up being a link to google.com.</a></p> <ul> <li><a href="http://www.google.com/">Item 1</a></li> <li><a href="http://www.google.com/">Item 2</a></li> </ul> <table border="1"><tbody><tr><td><a href="http://www.google.com/">1</a></td><td><a href="http://www.google.com/">2</a></td><td><a href="http://www.google.com/">3</a></td></tr></tbody></table> <a href="http://www.google.com/"><br> This </a><b><a href="http://www.google.com/">line</a></b><a href="http://www.google.com/"> contains </a><a href="http://www.google.com/"><img src="../resources/abe.jpg"> an image. </a>
5959

‎LayoutTests/editing/execCommand/unlink-expected.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This line contains an image.
5959
The innerHTML of editable regions after the test:
6060

6161
This paragraph should should end up unlinked.
62-
<A href="http://www.apple.com/">The</A> second<A href="http://www.apple.com/"> word in this paragraph should end up being unlinked, everything else should be a link.</A>
63-
This paragraph starts with <I><A href="http://www.google.com">a</A></I><SPAN id="test3start"> link</SPAN> in the middle. Only the 'a' in the previous sentence should be linked after the test.
64-
<P>This <I>editable region</I> contains lists, tables, styled text, and images. Everything in this region that is not selected should be a link, nothing that is selected should be a link.</P> <UL> <LI>Item 1</LI> <LI>Item 2</LI> </UL> <TABLE border="1"><TBODY><TR><TD>1</TD><TD>2</TD><TD><SPAN id="test4end"><A href="http://www.google.com/">3</A></SPAN></TD></TR></TBODY></TABLE> <A href="http://www.google.com/"><BR> This </A><B><A href="http://www.google.com/">line</A></B><A href="http://www.google.com/"> contains </A><A href="http://www.google.com/"><IMG src="../resources/abe.jpg"> an image. </A>
62+
<a href="http://www.apple.com/">The</a> second<a href="http://www.apple.com/"> word in this paragraph should end up being unlinked, everything else should be a link.</a>
63+
This paragraph starts with <i><a href="http://www.google.com">a</a></i><span id="test3start"> link</span> in the middle. Only the 'a' in the previous sentence should be linked after the test.
64+
<p>This <i>editable region</i> contains lists, tables, styled text, and images. Everything in this region that is not selected should be a link, nothing that is selected should be a link.</p> <ul> <li>Item 1</li> <li>Item 2</li> </ul> <table border="1"><tbody><tr><td>1</td><td>2</td><td><span id="test4end"><a href="http://www.google.com/">3</a></span></td></tr></tbody></table> <a href="http://www.google.com/"><br> This </a><b><a href="http://www.google.com/">line</a></b><a href="http://www.google.com/"> contains </a><a href="http://www.google.com/"><img src="../resources/abe.jpg"> an image. </a>
6565

‎LayoutTests/editing/input/attributed-substring-from-range-lines-expected.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ line two
9797
and three   
9898

9999
Actual HTML:
100-
<pre> <DIV class="editing" id="test"></DIV> </pre>
100+
<pre> <div class="editing" id="test"></div> </pre>
101101
(0, 0):
102102
(0, 0) length: 0
103103
(0, 2): 12{ NSColor = NSCalibratedWhiteColorSpace 0 1; NSFont = "Times-Roman 16.00 pt. S [] (0xXXXXXXXX) fobj=0xXXXXXXXX, spc=4.00"; }

‎LayoutTests/fast/dom/Range/range-exceptions-expected.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ This test checks a few DOM range exceptions.
33
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
44

55

6-
PASS node.innerHTML is '<BAR>AB<MOO>C</MOO>DE</BAR>'
7-
PASS foo.outerHTML is '<FOO></FOO>'
6+
PASS node.innerHTML is '<bar>AB<moo>C</moo>DE</bar>'
7+
PASS foo.outerHTML is '<foo></foo>'
88
PASS range.surroundContents(foo) threw exception Error: BAD_BOUNDARYPOINTS_ERR: DOM Range Exception 1.
99
PASS successfullyParsed is true
1010

‎LayoutTests/fast/dom/Range/resources/range-exceptions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ description(
55
// Test to be sure the name BAD_BOUNDARYPOINTS_ERR dumps properly.
66
var node = document.createElement("DIV");
77
node.innerHTML = "<BAR>AB<MOO>C</MOO>DE</BAR>";
8-
shouldBe("node.innerHTML", "'<BAR>AB<MOO>C</MOO>DE</BAR>'");
8+
shouldBe("node.innerHTML", "'<bar>AB<moo>C</moo>DE</bar>'");
99
var range = document.createRange();
1010
range.setStart(node.firstChild, 1);
1111
range.setEnd(node.firstChild, 2);
1212
var foo = document.createElement("FOO");
13-
shouldBe("foo.outerHTML", "'<FOO></FOO>'");
13+
shouldBe("foo.outerHTML", "'<foo></foo>'");
1414
shouldThrow("range.surroundContents(foo)");
1515

1616
var successfullyParsed = true;

‎LayoutTests/fast/innerHTML/005-expected.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
Content:
2-
<HEAD>
3-
<META name="description" content="This tests html output">
4-
<TITLE>html innerHTML test</TITLE>
5-
</HEAD><BODY>
6-
<SPAN>Content:</SPAN>
7-
<PRE id="content">placeholder</PRE>
8-
<DIV></DIV>
9-
<SPAN></SPAN>
10-
<B>test</B>
11-
<BR>
12-
<SCRIPT>
2+
<head>
3+
<meta name="description" content="This tests html output">
4+
<title>html innerHTML test</title>
5+
</head><body>
6+
<span>Content:</span>
7+
<pre id="content">placeholder</pre>
8+
<div></div>
9+
<span></span>
10+
<b>test</b>
11+
<br>
12+
<script>
1313
if (window.layoutTestController)
1414
layoutTestController.dumpAsText();
1515
document.getElementById("content").firstChild.nodeValue = document.documentElement.innerHTML;
16-
</SCRIPT></BODY>
16+
</script></body>
1717
test
1818

‎LayoutTests/fast/innerHTML/innerHTML-case-expected.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This test checks to see if innerHTML is outputting in the proper case, i.e. all tags and methods lower-case.
2+
3+
4+
5+
Original: <BR /><br /><HR /><hr /><Br><dIv sTyLe="color:bluE;"></dIv>
6+
Result: <br><br><hr><hr><br><div style="color:bluE;"></div>
7+

‎LayoutTests/fast/innerHTML/innerHTML-case.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<div id="description">This test checks to see if innerHTML is outputting in the proper case, i.e. all tags and methods lower-case.</div>
2+
3+
<div id="test" style="display:none"></div>
4+
5+
<div id="console"></div>
6+
7+
<script language="javascript">
8+
if (window.layoutTestController)
9+
window.layoutTestController.dumpAsText();
10+
11+
function log(message) {
12+
var console = document.getElementById("console");
13+
var li = document.createElement("li");
14+
var pre = document.createElement("pre");
15+
pre.appendChild(document.createTextNode(message));
16+
li.appendChild(pre);
17+
console.appendChild(li);
18+
}
19+
20+
var html = "<BR /><br /><HR /><hr /><Br><dIv sTyLe=\"color:bluE;\"></dIv>";
21+
22+
var e = document.getElementById("test");
23+
e.innerHTML = html;
24+
25+
log("Original: " + html);
26+
log("Result: " + e.innerHTML);
27+
28+
</script>

‎LayoutTests/fast/innerHTML/innerHTML-custom-tag-expected.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Content:
22

3-
<SPAN>Content:</SPAN>
4-
<PRE id="content">placeholder</PRE>
5-
<DIV></DIV>
6-
<SPAN></SPAN>
7-
<B>test</B>
8-
<BR>
9-
<EMPTYCUSTOMTAG></EMPTYCUSTOMTAG>
3+
<span>Content:</span>
4+
<pre id="content">placeholder</pre>
5+
<div></div>
6+
<span></span>
7+
<b>test</b>
8+
<br>
9+
<emptycustomtag></emptycustomtag>
1010
<anotherEmptyCustomTag></anotherEmptyCustomTag>
11-
<CUSTOMTAG>more test</CUSTOMTAG>
12-
<DIV id="testArea"></DIV>
11+
<customtag>more test</customtag>
12+
<div id="testArea"></div>
1313

1414

1515

0 commit comments

Comments
 (0)