Merge pull request #237 from alice/master

Revert #150
GoogleChrome · Sep 4, 2015 · 0062f77 · 0062f77
2 parents 6d89304 + df40093
commit 0062f77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+### Bug fixes:
+
+* Revert #150 which was causing the extension not to work.
+
 ## 2.9.0 - 2015-09-04
 
 ## 2.9.0-rc.0 - 2015-08-21

diff --git a/src/js/AuditRule.js b/src/js/AuditRule.js
@@ -183,13 +183,6 @@ axs.AuditRule.collectMatchingElements = function(node, matcher, collection,
         }
     }
 
-    // If it is a iframe, get the contentDocument
-    if (element && element.localName == 'iframe' && element.contentDocument) {
-        axs.AuditRule.collectMatchingElements(element.contentDocument,
-                                              matcher,
-                                              collection,
-                                              opt_shadowRoot);
-    }
     // If it is neither the parent of a ShadowRoot, a <content> element, nor
     // a <shadow> element recurse normally.
     var child = node.firstChild;

diff --git a/test/js/audit-rule-test.js b/test/js/audit-rule-test.js
@@ -41,16 +41,6 @@
         equal(matched.length, DIV_COUNT);
     });
 
-    test("Iframe with simple DOM", function () {
-        var ifrm = document.createElement("IFRAME");
-        var container = document.getElementById('qunit-fixture');
-        container.appendChild(ifrm);
-        ifrm.contentDocument.body.appendChild(buildTestDom());
-        var matched = [];
-        axs.AuditRule.collectMatchingElements(container, matcher, matched);
-        equal(matched.length, DIV_COUNT);
-    });
-
     test("With shadow DOM with no content insertion point", function () {
         var container = document.getElementById('qunit-fixture');
         container.appendChild(buildTestDom());