From da6f05594e78428e38ad659e56d49aa0bd25f22d Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Thu, 9 Aug 2012 23:30:46 -0700
Subject: [PATCH] Bug 779796 - Part 3: Update Readability.js to be compatible
 with JSDOMParser. r=lucasr

---
 mobile/android/chrome/content/Readability.js | 34 +++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/mobile/android/chrome/content/Readability.js b/mobile/android/chrome/content/Readability.js
index 3cdb595412b..580b226513a 100644
--- a/mobile/android/chrome/content/Readability.js
+++ b/mobile/android/chrome/content/Readability.js
@@ -511,7 +511,28 @@ Readability.prototype = {
       let node = null;
       let nodesToScore = [];
 
-      for (let nodeIndex = 0; (node = allElements[nodeIndex]); nodeIndex += 1) {
+      // Let each node know its index in the allElements array.
+      for (let i = allElements.length; --i >= 0;) {
+        allElements[i]._index = i;
+      }
+
+      /**
+       * JSDOMParser returns static node lists, not live ones. When we remove
+       * an element from the document, we need to manually remove it - and all
+       * of its children - from the allElements array.
+       */
+      function purgeNode(node) {
+        for (let i = node.childNodes.length; --i >= 0;) {
+          purgeNode(node.childNodes[i]);
+        }
+        if (node._index !== undefined && allElements[node._index] == node)
+          delete allElements[node._index];
+      }
+
+      for (let nodeIndex = 0; nodeIndex < allElements.length; nodeIndex++) {
+        if (!(node = allElements[nodeIndex]))
+          continue;
+
         // Remove unlikely candidates
         if (stripUnlikelyCandidates) {
           let unlikelyMatchString = node.className + node.id;
@@ -520,7 +541,7 @@ Readability.prototype = {
             node.tagName !== "BODY") {
             this.log("Removing unlikely candidate - " + unlikelyMatchString);
             node.parentNode.removeChild(node);
-            nodeIndex -= 1;
+            purgeNode(node);
             continue;
           }
         }
@@ -534,6 +555,12 @@ Readability.prototype = {
             let newNode = doc.createElement('p');
             newNode.innerHTML = node.innerHTML;
             node.parentNode.replaceChild(newNode, node);
+
+            // Manually update allElements since it is not a live NodeList
+            newNode._index = nodeIndex;
+            allElements[nodeIndex] = newNode;
+            purgeNode(node);
+
             nodeIndex -= 1;
             nodesToScore[nodesToScore.length] = node;
           } else {
@@ -545,10 +572,9 @@ Readability.prototype = {
 
               if (childNode.nodeType === 3) { // Node.TEXT_NODE
                 let p = doc.createElement('p');
-                p.innerHTML = childNode.nodeValue;
+                p.innerHTML = childNode.textContent;
                 p.style.display = 'inline';
                 p.className = 'readability-styled';
-
                 childNode.parentNode.replaceChild(p, childNode);
               }
             }