From ac70617a05b32f53f070e577ec0a3b49d23f21e2 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Wed, 12 Jul 2017 20:00:02 -0700 Subject: [PATCH] add limits --- brozzler/behaviors.yaml | 9 +++---- brozzler/js-templates/umbraBehavior.js.j2 | 30 ++++++++++++++++++----- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/brozzler/behaviors.yaml b/brozzler/behaviors.yaml index 3bfa3bd..892fd31 100644 --- a/brozzler/behaviors.yaml +++ b/brozzler/behaviors.yaml @@ -38,14 +38,13 @@ behavior_js_template: instagram.js request_idle_timeout_sec: 10 - - url_regex: '^https?://(?:www\.)?huffingtonpost\.com/.*$' + url_regex: '^https?://(?:www\.)?pm\.gc\.ca/.*$' behavior_js_template: umbraBehavior.js.j2 default_parameters: actions: - - selector: .slideshow - do: click - - selector: .slideshow-overlay__container__left__nav__next - do: click + - selector: li.pager__item a + limit: 4 + - selector: div.teaser - url_regex: '^https?://(?:www\.)?huffingtonpost\.com/.*$' behavior_js_template: huffpostslides.js diff --git a/brozzler/js-templates/umbraBehavior.js.j2 b/brozzler/js-templates/umbraBehavior.js.j2 index cfe39c8..d4e1320 100644 --- a/brozzler/js-templates/umbraBehavior.js.j2 +++ b/brozzler/js-templates/umbraBehavior.js.j2 @@ -22,18 +22,23 @@ var umbraBehavior = { alreadyDone : [], idleSince : null, intervalId : null, + actions : {{actions|json}}, intervalFunc: function() { var didSomething = false; var somethingLeftBelow = false; var somethingLeftAbove = false; - - var actions = {{actions|json}}; - var actionsLength = actions.length; + var actionsLength = this.actions.length; for (var k = 0; k < actionsLength; k++) { - var selector = actions[k].selector; - var action = actions[k].do; + var selector = this.actions[k].selector; + var action = this.actions[k].do ? this.actions[k].do : 'click'; + if (this.actions[k].limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= this.actions[k].limit) { + continue; + } + if (this.actions[k].limit && !(this.actions[k].alreadyDone)) { + this.actions[k].alreadyDone = []; + } var iframes = document.querySelectorAll("iframe"); var documents = Array(iframes.length + 1); @@ -47,20 +52,33 @@ var umbraBehavior = { documentsLength = documents.length; for (var j = 0; j < documentsLength; j++) { + if (this.actions[k].limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= this.actions[k].limit) { + break; + } var doTargets = documents[j].querySelectorAll(selector); + if (doTargets == []) { + continue; + } doTargetsLength = doTargets.length; for ( var i = 0; i < doTargetsLength; i++) { + if (this.actions[k].limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= this.actions[k].limit) { + break; + } if (this.alreadyDone.indexOf(doTargets[i]) > -1) { continue; } if (!this.isVisible(doTargets[i])) { continue; } + var where = this.aboveBelowOrOnScreen(doTargets[i]); if (where == 0) { this.doTarget(doTargets[i], action); didSomething = true; + if (this.actions[k].alreadyDone) { + this.actions[k].alreadyDone.push(doTargets[i]); + } } else if (where > 0) { somethingLeftBelow = true; } else if (where < 0) { @@ -90,7 +108,7 @@ var umbraBehavior = { } } - if (!idleSince) { + if (!this.idleSince) { this.idleSince = Date.now(); } }