Merge pull request #145 from galgeek/no-skipIframes

no skipIframes for umbraBehavior
This commit is contained in:
Noah Levitt 2018-12-20 11:30:28 -08:00 committed by GitHub
commit 0a08c01461
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 18 deletions

View file

@ -25,8 +25,6 @@
url_regex: '^https?://(?:www\.)?instagram\.com/.*$' url_regex: '^https?://(?:www\.)?instagram\.com/.*$'
behavior_js_template: umbraBehavior.js.j2 behavior_js_template: umbraBehavior.js.j2
default_parameters: default_parameters:
interval: 500
skip_iframes: true
actions: actions:
- selector: button.coreSpriteDismissLarge - selector: button.coreSpriteDismissLarge
- selector: 'a>.eLAPa>.KL4Bh' - selector: 'a>.eLAPa>.KL4Bh'

View file

@ -26,11 +26,6 @@ class UmbraBehavior {
this.idleSince = null; this.idleSince = null;
this.intervalId = null; this.intervalId = null;
this.intervalTimeMs = {{interval or 300}}; this.intervalTimeMs = {{interval or 300}};
{% if skip_iframes %}
this.skipIframes = true;
{% else %}
this.skipIframes = false;
{% endif %}
this.index = 0; this.index = 0;
} }
@ -48,17 +43,15 @@ class UmbraBehavior {
var documents = []; var documents = [];
documents[0] = document; documents[0] = document;
if (!(this.skipIframes)) { var iframes = document.querySelectorAll("iframe");
var iframes = document.querySelectorAll("iframe"); var iframesLength = iframes.length;
var iframesLength = iframes.length; for (var i = 0; i < iframesLength; i++) {
for (var i = 0; i < iframesLength; i++) { try {
try { documents.push(iframes[i].contentWindow.document);
documents.push(iframes[i].contentWindow.document); } catch (e) {
} catch (e) { // it'd be too much logging because this is common:
// it'd be too much logging because this is common: // SecurityError: Blocked a frame with origin "..." from accessing a cross-origin frame
// SecurityError: Blocked a frame with origin "..." from accessing a cross-origin frame // console.log("exception looking at iframe" + iframes[i] + ": " + e);
// console.log("exception looking at iframe" + iframes[i] + ": " + e);
}
} }
} }
var documentsLength = documents.length; var documentsLength = documents.length;