Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-04-21 08:06:27 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'ARI-5617' into qa

Browse Source
This commit is contained in:
Barbara Miller 2018-03-14 13:13:26 -07:00
commit 7713f0eb69
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
brozzler/behaviors.yaml
View File

@ -25,9 +25,11 @@
url_regex: '^https?://americaspresidents\.si\.edu/gallery.*$'
behavior_js_template: umbraBehavior.js.j2
default_parameters:
interval: 2000
interval: 2500
actions:
- selector: div.see-more, li.next
- selector: div.see-more
onceOnly: 1
- selector: li.next
skipIDcheck: 1
-
url_regex: '^https?://(?:www\.)?marquette\.edu/.*$'

11
brozzler/js-templates/umbraBehavior.js.j2
View File

@ -25,7 +25,7 @@ class UmbraBehavior {
this.alreadyDone = [];
this.idleSince = null;
this.intervalId = null;
this.intervalTimeMs = {{interval or '300'}};
this.intervalTimeMs = {{interval or 300}};
this.index = 0;
}
@ -33,7 +33,8 @@ class UmbraBehavior {
// should match older default and simpleclicks behavior, and more
var k = this.index;
var selector = this.actions[k].selector;
var skipIDCheck = this.actions[k].skipIDcheck ? this.actions[k].skipIDcheck !== false : false;
var skipIDCheck = this.actions[k].skipIDcheck ? this.actions[k].skipIDcheck != false : false;
var onceOnly = this.actions[k].onceOnly ? this.actions[k].onceOnly != false: false;
var action = this.actions[k].do ? this.actions[k].do : 'click';
var closeSelector = this.actions[k].closeSelector ? this.actions[k].closeSelector : null;
var didSomething = false;
@ -57,7 +58,11 @@ class UmbraBehavior {
doTarget(closeTargets[0], 'click');
}
}
var doTargets = documents[j].querySelectorAll(selector);
if (onceOnly) {
var doTargets = [ documents[j].querySelector(selector) ];
} else {
var doTargets = documents[j].querySelectorAll(selector);
}
var doTargetsLength = doTargets.length;
if (!(doTargetsLength > 0)) {
continue;