Implemented .innerText getter and setter for HTML elements. <title>.text

now implemented in terms of this. New unit tests.
thatcher · Sep 13, 2009 · 16a4dcd · 16a4dcd
1 parent 58a5df4
commit 16a4dcd
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 43 deletions.
diff --git a/dist/env-js.jar b/dist/env-js.jar
diff --git a/dist/env.js b/dist/env.js
@@ -5143,6 +5143,20 @@ var HTMLElement = function(ownerDocument) {
 };
 HTMLElement.prototype = new DOMElement;
 __extend__(HTMLElement.prototype, {
+    $recursivelyGatherTextFromNodeTree: function(aNode) {
+        var accumulateText = "";
+        var idx; var n;
+        for (idx=0;idx < aNode.childNodes.length;idx++){
+            n = aNode.childNodes.item(idx);
+        if      (n.nodeType == DOMNode.TEXT_NODE)
+                accumulateText += n.data;
+            else
+                accumulateText += this.$recursivelyGatherTextFromNodeTree(n);
+        }
+
+        return accumulateText;
+    },
+
 		get className() { 
 		    return this.getAttribute("class")||''; 
 	    },
@@ -5188,6 +5202,12 @@ __extend__(HTMLElement.prototype, {
 		    //Mark for garbage collection
 		    doc = null;
 		},
+        get innerText(){
+            return this.$recursivelyGatherTextFromNodeTree(this);
+        },
+        set innerText(newText){
+            this.innerHTML = newText;  // a paranoid would HTML-escape, but...
+        },
 		get lang() { 
 		    return this.getAttribute("lang"); 
 
@@ -7449,21 +7469,8 @@ var HTMLTitleElement = function(ownerDocument) {
 };
 HTMLTitleElement.prototype = new HTMLElement;
 __extend__(HTMLTitleElement.prototype, {
-    $recursivelyGatherTextFromNodeTree: function(aNode) {
-        var accumulateText = "";
-        var idx; var n;
-        for (idx=0;idx < aNode.childNodes.length;idx++){
-            n = aNode.childNodes.item(idx);
-	    if      (n.nodeType == DOMNode.TEXT_NODE)
-                accumulateText += n.data;
-            else
-                accumulateText += this.$recursivelyGatherTextFromNodeTree(n);
-        }
-
-        return accumulateText;
-    },
     get text() {
-        return this.$recursivelyGatherTextFromNodeTree(this);
+        return this.innerText;
     },
 
     set text(titleStr) {

diff --git a/dist/env.rhino.js b/dist/env.rhino.js
@@ -5781,6 +5781,20 @@ var HTMLElement = function(ownerDocument) {
 };
 HTMLElement.prototype = new DOMElement;
 __extend__(HTMLElement.prototype, {
+    $recursivelyGatherTextFromNodeTree: function(aNode) {
+        var accumulateText = "";
+        var idx; var n;
+        for (idx=0;idx < aNode.childNodes.length;idx++){
+            n = aNode.childNodes.item(idx);
+        if      (n.nodeType == DOMNode.TEXT_NODE)
+                accumulateText += n.data;
+            else
+                accumulateText += this.$recursivelyGatherTextFromNodeTree(n);
+        }
+
+        return accumulateText;
+    },
+
 		get className() { 
 		    return this.getAttribute("class")||''; 
 	    },
@@ -5826,6 +5840,12 @@ __extend__(HTMLElement.prototype, {
 		    //Mark for garbage collection
 		    doc = null;
 		},
+        get innerText(){
+            return this.$recursivelyGatherTextFromNodeTree(this);
+        },
+        set innerText(newText){
+            this.innerHTML = newText;  // a paranoid would HTML-escape, but...
+        },
 		get lang() { 
 		    return this.getAttribute("lang"); 
 
@@ -8087,21 +8107,8 @@ var HTMLTitleElement = function(ownerDocument) {
 };
 HTMLTitleElement.prototype = new HTMLElement;
 __extend__(HTMLTitleElement.prototype, {
-    $recursivelyGatherTextFromNodeTree: function(aNode) {
-        var accumulateText = "";
-        var idx; var n;
-        for (idx=0;idx < aNode.childNodes.length;idx++){
-            n = aNode.childNodes.item(idx);
-	    if      (n.nodeType == DOMNode.TEXT_NODE)
-                accumulateText += n.data;
-            else
-                accumulateText += this.$recursivelyGatherTextFromNodeTree(n);
-        }
-
-        return accumulateText;
-    },
     get text() {
-        return this.$recursivelyGatherTextFromNodeTree(this);
+        return this.innerText;
     },
 
     set text(titleStr) {

diff --git a/src/html/element.js b/src/html/element.js
@@ -10,6 +10,20 @@ var HTMLElement = function(ownerDocument) {
 };
 HTMLElement.prototype = new DOMElement;
 __extend__(HTMLElement.prototype, {
+    $recursivelyGatherTextFromNodeTree: function(aNode) {
+        var accumulateText = "";
+        var idx; var n;
+        for (idx=0;idx < aNode.childNodes.length;idx++){
+            n = aNode.childNodes.item(idx);
+        if      (n.nodeType == DOMNode.TEXT_NODE)
+                accumulateText += n.data;
+            else
+                accumulateText += this.$recursivelyGatherTextFromNodeTree(n);
+        }
+
+        return accumulateText;
+    },
+
 		get className() { 
 		    return this.getAttribute("class")||''; 
 	    },
@@ -55,6 +69,12 @@ __extend__(HTMLElement.prototype, {
 		    //Mark for garbage collection
 		    doc = null;
 		},
+        get innerText(){
+            return this.$recursivelyGatherTextFromNodeTree(this);
+        },
+        set innerText(newText){
+            this.innerHTML = newText;  // a paranoid would HTML-escape, but...
+        },
 		get lang() { 
 		    return this.getAttribute("lang"); 
 

diff --git a/src/html/title.js b/src/html/title.js
@@ -8,21 +8,8 @@ var HTMLTitleElement = function(ownerDocument) {
 };
 HTMLTitleElement.prototype = new HTMLElement;
 __extend__(HTMLTitleElement.prototype, {
-    $recursivelyGatherTextFromNodeTree: function(aNode) {
-        var accumulateText = "";
-        var idx; var n;
-        for (idx=0;idx < aNode.childNodes.length;idx++){
-            n = aNode.childNodes.item(idx);
-	    if      (n.nodeType == DOMNode.TEXT_NODE)
-                accumulateText += n.data;
-            else
-                accumulateText += this.$recursivelyGatherTextFromNodeTree(n);
-        }
-
-        return accumulateText;
-    },
     get text() {
-        return this.$recursivelyGatherTextFromNodeTree(this);
+        return this.innerText;
     },
 
     set text(titleStr) {

diff --git a/test/test.js b/test/test.js
@@ -26,7 +26,8 @@ window.onload = function(){
   // Load the tests
   load(
       "test/unit/dom.js",
-      "test/unit/window.js"
+      "test/unit/window.js",
+      "test/unit/elementmembers.js"
   );
   if (whichJarFile == "envjs")
     load(

diff --git a/test/unit/elementmembers.js b/test/unit/elementmembers.js
@@ -0,0 +1,29 @@
+module("elementmembers");
+
+// We ought to have test coverage for all members of all DOM objects, but
+// until then, add test cases here for members as they are created
+
+test("attributes common to all HTML elements", function() {
+    expect(4);
+
+    // tests for .innerText
+    var mtch = document.getElementById('dl').innerText.match(
+        /^See this blog entry for more information.\s+Here are/);
+    try{ ok(mtch && mtch.length > 0,
+        "dl.innerText returns the correct content");
+    }catch(e){print(e);}
+
+    mtch = document.getElementById('sndp').innerText.match(/^Everything insid/);
+    try{ ok(mtch && mtch.length > 0,
+        "p.innerText returns the correct content");
+    }catch(e){print(e);}
+
+    try{ ok(document.getElementById('sndp').innerText = "test text" || true,
+        "p.innerText= operates without exception");
+    }catch(e){print(e);}
+
+    try{ ok(document.getElementById('sndp').innerText == "test text",
+        "p.innerText= changes content of element");
+    }catch(e){print(e);}
+});
+