Merge branch 'ARI-5617' into qa

This commit is contained in:
Barbara Miller 2018-03-13 18:49:00 -07:00
commit f7a655985b
2 changed files with 5 additions and 4 deletions

View File

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

View File

@ -25,7 +25,7 @@ class UmbraBehavior {
this.alreadyDone = [];
this.idleSince = null;
this.intervalId = null;
this.intervalTimeMs = 300;
this.intervalTimeMs = {{interval or '300'}};
this.index = 0;
}
@ -33,7 +33,7 @@ class UmbraBehavior {
// should match older default and simpleclicks behavior, and more
var k = this.index;
var selector = this.actions[k].selector;
var idCheck = this.actions[k].idcheck ? this.actions[k].idcheck : true;
var skipIDCheck = this.actions[k].skipIDcheck ? this.actions[k].skipIDcheck !== 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;
@ -63,7 +63,7 @@ class UmbraBehavior {
continue;
}
for ( var i = 0; i < doTargetsLength; i++) {
if idCheck and (this.alreadyDone.indexOf(doTargets[i]) > -1) {
if (!skipIDCheck && this.alreadyDone.indexOf(doTargets[i]) > -1) {
continue;
}
if (!this.isVisible(doTargets[i])) {