close selctor, more button, more

This commit is contained in:
Barbara Miller 2017-10-04 19:55:43 -07:00
parent dabbdef88b
commit e4bea7590e
2 changed files with 128 additions and 85 deletions

View file

@ -52,8 +52,11 @@
closeSelector: .pmf-artist-modal__close-btn
-
url_regex: '^https?://(?:www\.)?huffingtonpost\.com/.*$'
behavior_js_template: huffpostslides.js
request_idle_timeout_sec: 10
behavior_js_template: umbraBehavior.js.j2
default_parameters:
actions:
- selector: .slideshow
- selector: .slideshow-overlay__container__left__nav__next
-
url_regex: '^https?://(?:www\.)?brooklynmuseum\.org/exhibitions/.*$'
behavior_js_template: simpleclicks.js.j2
@ -156,5 +159,7 @@
request_idle_timeout_sec: 10
- # default fallback behavior
url_regex: '^.*$'
request_idle_timeout_sec: 10
behavior_js_template: default.js
behavior_js_template: umbraBehavior.js.j2
default_parameters:
actions:
- selector: button.sc-button-play, button.playButton, div.soundItem

View file

@ -1,5 +1,5 @@
/*
* brozzler/js-templates/umbrabehavior.js.j2 - a library for umbra/brozzler behaviors
* brozzler/js-templates/umbrabehavior.js.j2 - a generalized umbra/brozzler behavior
*
* Copyright (C) 2017 Internet Archive
*
@ -24,23 +24,60 @@ var umbraBehavior = {
intervalId : null,
state : null,
// actions : [{'selector': 'div.teaser, li.pager__item a'}],
actions : {{actions|json}},
actions : [{'selector': 'div.teaser, li.pager__item a'}],
//actions : {{actions|json}},
k : 0,
intervalFunc: function() {
if (!this.state) {
this.state = this.actions.length === 1 ? "simple" : "fancy";
} else if (this.actions.length === k + 1) {
// last action always uses simple block
this.state = "simple";
}
for (var k = 0; k < this.actions.length; k++) {
var k = this.k;
var selector = this.actions[k].selector;
var action = this.actions[k].do ? this.actions[k].do : 'click';
var closeSelector = this.actions[k].closeSelector ? this.actions[k].closeSelector : null;
var limit = this.actions[k].limit ? this.actions[k].limit : 0;
if (limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= limit) {
continue;
// need to figure out more about how to end more complex actions...
// var limit = this.actions[k].limit ? this.actions[k].limit : 0;
// if (limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= limit) {
// continue;
// }
// if (limit && !(this.actions[k].alreadyDone)) {
// this.actions[k].alreadyDone = [];
// }
if (this.state === "fancy") {
var moreButton = document.querySelectorAll(selector);
if (moreButton.length > 0) {
console.log("clicking more button");
this.doTarget(moreButton[0],action);
this.k++; // use next action at next run of interval function
return;
}
if (window.scrollY + window.innerHeight < document.documentElement.scrollHeight) {
window.scrollBy(0, 200);
this.idleSince = null;
return;
}
if (this.idleSince === null) {
console.log("nothing to do at the moment, might be waiting for something to load, setting this.idleSince=Date.now()");
this.idleSince = Date.now();
return;
} else {
if ((Date.now() - this.idleSince) > 9000) {
console.log("finished loading-thumbs, it appears we have reached the bottom");
this.state = "clicking-first-thumb";
this.idleSince = null;
}
return;
}
if (limit && !(this.actions[k].alreadyDone)) {
this.actions[k].alreadyDone = [];
}
if (this.state === "simple") {
@ -78,9 +115,11 @@ var umbraBehavior = {
doTargetsLength = doTargets.length;
for ( var i = 0; i < doTargetsLength; i++) {
if (limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= limit) {
break;
}
// if using limits...
// if (limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= limit) {
// break;
// }
if (this.alreadyDone.indexOf(doTargets[i]) > -1) {
continue;
}
@ -90,9 +129,9 @@ var umbraBehavior = {
var where = this.aboveBelowOrOnScreen(doTargets[i]);
if (where == 0) {
this.doTarget(doTargets[i], action);
if (this.actions[k].alreadyDone) {
this.actions[k].alreadyDone.push(doTargets[i]);
}
// if (this.actions[k].alreadyDone) {
// this.actions[k].alreadyDone.push(doTargets[i]);
// }
didSomething = true;
break; // break from doTargets loop, but not from documents loop
} else if (where > 0) {
@ -125,7 +164,6 @@ var umbraBehavior = {
if (!this.idleSince) {
this.idleSince = Date.now();
}
}
},
aboveBelowOrOnScreen : function(elem) {