Fix: closeSelector not being clicked

Add: support for facebook.com/ads/library - Open and close metrics for ads
This commit is contained in:
Corentin Barreau 2019-09-16 02:40:44 +02:00
parent efa185a8dc
commit 5c5743ea11
2 changed files with 24 additions and 7 deletions

View File

@ -17,6 +17,15 @@
# #
# first matched behavior is used, so order matters here # first matched behavior is used, so order matters here
-
url_regex: '^https?://(?:www\.)?facebook\.com/ads/library/.*$'
behavior_js_template: umbraBehavior.js.j2
request_idle_timeout_sec: 30
default_parameters:
interval: 500
actions:
- selector: 'a[data-testid="snapshot_footer_link"]'
closeSelector: 'div._7lq1 > button'
- -
url_regex: '^https?://(?:www\.)?facebook\.com/.*$' url_regex: '^https?://(?:www\.)?facebook\.com/.*$'
behavior_js_template: facebook.js behavior_js_template: facebook.js

View File

@ -43,6 +43,7 @@ class UmbraBehavior {
var documents = []; var documents = [];
documents[0] = document; documents[0] = document;
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++) {
@ -54,25 +55,27 @@ class UmbraBehavior {
// 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;
for (var j = 0; j < documentsLength; j++) { for (var j = 0; j < documentsLength; j++) {
if (closeSelector) { if (closeSelector) {
var closeTargets = documents[j].querySelectorAll(closeSelector); var closeTargets = documents[j].querySelectorAll(closeSelector);
if ((closeTargets.length > 0) && for (var i = 0; i < closeTargets.length; i++) {
(this.alreadyDone.indexOf(closeTargets[0]) === -1) && this.doTarget(closeTargets[i], "click", "close");
(this.isVisible(closeTargets[0]))) {
doTarget(closeTargets[0], 'click');
} }
} }
if (firstMatchOnly) { if (firstMatchOnly) {
var doTargets = [ documents[j].querySelector(selector) ]; var doTargets = [ documents[j].querySelector(selector) ];
} else { } else {
var doTargets = documents[j].querySelectorAll(selector); var doTargets = documents[j].querySelectorAll(selector);
} }
var doTargetsLength = doTargets.length; var doTargetsLength = doTargets.length;
if (!(doTargetsLength > 0)) { if (!(doTargetsLength > 0)) {
continue; continue;
} }
for ( var i = 0; i < doTargetsLength; i++) { for ( var i = 0; i < doTargetsLength; i++) {
if (!repeatSameElement && this.alreadyDone.indexOf(doTargets[i]) > -1) { if (!repeatSameElement && this.alreadyDone.indexOf(doTargets[i]) > -1) {
continue; continue;
@ -82,7 +85,7 @@ class UmbraBehavior {
} }
var where = this.aboveBelowOrOnScreen(doTargets[i]); var where = this.aboveBelowOrOnScreen(doTargets[i]);
if (where == 0) { if (where == 0) {
this.doTarget(doTargets[i], action); this.doTarget(doTargets[i], action, 'open');
didSomething = true; didSomething = true;
break; break;
} else if (where > 0) { } else if (where > 0) {
@ -133,7 +136,7 @@ class UmbraBehavior {
return elem && !!(elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length); return elem && !!(elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length);
} }
doTarget(target, action) { doTarget(target, action, type) {
// console.log("doing " + action + target.outerHTML); // console.log("doing " + action + target.outerHTML);
// do mouse over event on target // do mouse over event on target
// since some urls are requsted only on // since some urls are requsted only on
@ -147,7 +150,12 @@ class UmbraBehavior {
target.click(); target.click();
} // add new do's here! } // add new do's here!
// Only push the element to alreadyDone if it's
// an element we want to open. No need to track
// the close selectors
if (type == "open") {
this.alreadyDone.push(target); this.alreadyDone.push(target);
}
this.idleSince = null; this.idleSince = null;
} }