[Pkg-mozext-commits] [requestpolicy] 24/257: [ref] xul.jsm: simplify the element removal

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 0d5c1e6039cd64426caa849a0522545c2dd8dfe4
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sun Aug 9 02:22:59 2015 +0200

    [ref] xul.jsm: simplify the element removal
---
 src/content/lib/utils/xul.jsm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/content/lib/utils/xul.jsm b/src/content/lib/utils/xul.jsm
index aabc853..639bfb4 100644
--- a/src/content/lib/utils/xul.jsm
+++ b/src/content/lib/utils/xul.jsm
@@ -149,17 +149,16 @@ XULUtils.addTreeElementsToWindow = function(aWin, aTreeName) {
   }
 }
 
-var elementIDsToRemove = {};
-
-function getElementIDsToRemove(aTreeName) {
-  if (elementIDsToRemove.hasOwnProperty(aTreeName)) {
-    return elementIDsToRemove[aTreeName];
-  }
-  let ids = elementIDsToRemove[aTreeName] = [];
-  let tree = xulTrees[aTreeName];
-  for (let i in tree) {
-    ids.push(tree[i].attributes.id);
-  }
+/**
+ * Return a list of the IDs of the specified tree's root elements.
+ *
+ * @param {string} aTreeName
+ * @return {Array<string>} The list of IDs.
+ */
+function getRootElementIDs(aTreeName) {
+  var ids = xulTrees[aTreeName].map(function (aElementSpec) {
+    return aElementSpec.attributes.id;
+  });
   return ids;
 }
 
@@ -167,11 +166,9 @@ XULUtils.removeTreeElementsFromWindow = function(aWin, aTreeName) {
   if (!xulTrees.hasOwnProperty(aTreeName)) {
     return;
   }
-  let tree = xulTrees[aTreeName];
-  let elementIDs = getElementIDsToRemove(aTreeName);
+  var elementIDs = getRootElementIDs(aTreeName);
 
-  for (let i in elementIDs) {
-    let id = elementIDs[i];
+  for (let id of elementIDs) {
     let node = aWin.document.getElementById(id);
     if (node && node.parentNode) {
       node.parentNode.removeChild(node);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git