| Index: LayoutTests/dom/xhtml/level1/core/hc_textwithnomarkup.js
|
| diff --git a/LayoutTests/dom/xhtml/level1/core/hc_textwithnomarkup.js b/LayoutTests/dom/xhtml/level1/core/hc_textwithnomarkup.js
|
| index 2b3bae93670511a58e2064c9be5d38a2d4ece691..972b5251b0baf36e67d8a7d05690f895aa03dd6c 100644
|
| --- a/LayoutTests/dom/xhtml/level1/core/hc_textwithnomarkup.js
|
| +++ b/LayoutTests/dom/xhtml/level1/core/hc_textwithnomarkup.js
|
| @@ -1,17 +1,14 @@
|
| -
|
| /*
|
| -Copyright © 2001-2004 World Wide Web Consortium,
|
| -(Massachusetts Institute of Technology, European Research Consortium
|
| -for Informatics and Mathematics, Keio University). All
|
| -Rights Reserved. This work is distributed under the W3C® Software License [1] in the
|
| -hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
| -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
| +Copyright © 2001-2004 World Wide Web Consortium,
|
| +(Massachusetts Institute of Technology, European Research Consortium
|
| +for Informatics and Mathematics, Keio University). All
|
| +Rights Reserved. This work is distributed under the W3C® Software License [1] in the
|
| +hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
| +the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
| [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
|
| */
|
|
|
| -
|
| -
|
| /**
|
| * Gets URI that identifies the test.
|
| * @return uri identifier of test
|
| @@ -41,26 +38,24 @@ function setUpPage() {
|
| builder = createConfiguredBuilder();
|
|
|
| docsLoaded = 0;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| }
|
| docsLoaded += preload(docRef, "doc", "hc_staff");
|
| -
|
| +
|
| if (docsLoaded == 1) {
|
| setUpPageStatus = 'complete';
|
| }
|
| } catch(ex) {
|
| - catchInitializationError(builder, ex);
|
| + catchInitializationError(builder, ex);
|
| setUpPageStatus = 'complete';
|
| }
|
| }
|
|
|
| -
|
| -
|
| //
|
| -// This method is called on the completion of
|
| +// This method is called on the completion of
|
| // each asychronous load started in setUpTests.
|
| //
|
| // When every synchronous loaded document has completed,
|
| @@ -72,18 +67,17 @@ function loadComplete() {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| -*
|
| +*
|
| If there is not any markup inside an Element or Attr node
|
| - content, then the text is contained in a single object
|
| + content, then the text is contained in a single object
|
| implementing the Text interface that is the only child
|
| of the element.
|
| -
|
| - Retrieve the textual data from the second child of the
|
| - third employee. That Text node contains a block of
|
| +
|
| + Retrieve the textual data from the second child of the
|
| + third employee. That Text node contains a block of
|
| multiple text lines without markup, so they should be
|
| - treated as a single Text node. The "getNodeValue()"
|
| + treated as a single Text node. The "getNodeValue()"
|
| method should contain the combination of the two lines.
|
|
|
| * @author Curt Arnold
|
| @@ -98,7 +92,7 @@ function hc_textwithnomarkup() {
|
| var nameNode;
|
| var nodeV;
|
| var value;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| @@ -111,11 +105,8 @@ function hc_textwithnomarkup() {
|
| value = nodeV.nodeValue;
|
|
|
| assertEquals("textWithNoMarkupAssert","Roger\n Jones",value);
|
| -
|
| -}
|
| -
|
| -
|
|
|
| +}
|
|
|
| function runTest() {
|
| hc_textwithnomarkup();
|
|
|