add simplerIntervalFunc...

This commit is contained in:
Barbara Miller 2017-11-27 16:14:53 -08:00
parent f78e1ff710
commit b589324a05

View File

@ -131,6 +131,93 @@ class UmbraBehavior {
}
}
simplerIntervalFunc() {
var k = this.index;
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 = [];
// }
// if (limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= limit) {
// continue;
// }
var didSomething = false;
var somethingLeftBelow = false;
var somethingLeftAbove = false;
if (closeSelector) {
var closeTargets = document.querySelectorAll(closeSelector);
if ((closeTargets.length > 0) &&
(this.alreadyDone.indexOf(closeTargets[0]) === -1) &&
(this.isVisible(closeTargets[0]))) {
console.log('closing');
doTarget(closeTargets[0], 'click');
}
}
var doTargets = document.querySelectorAll(selector);
var doTargetsLength = doTargets.length;
for ( var i = 0; i < doTargetsLength; i++) {
if (this.alreadyDone.indexOf(doTargets[i]) > -1) {
continue;
}
if (!this.isVisible(doTargets[i])) {
continue;
}
// if using limits...
// if (limit && this.actions[k].alreadyDone && this.actions[k].alreadyDone.length >= limit) {
// break;
// }
var where = this.aboveBelowOrOnScreen(doTargets[i]);
if (where == 0) {
this.doTarget(doTargets[i], action);
// if using limits...
// if (this.actions[k].alreadyDone) {
// this.actions[k].alreadyDone.push(doTargets[i]);
// }
didSomething = true;
break; // break from doTargets loop
} else if (where > 0) {
somethingLeftBelow = true;
} else if (where < 0) {
somethingLeftAbove = true;
}
}
if (!didSomething) {
if (somethingLeftAbove) {
// console.log("scrolling up");
window.scrollBy(0, -500);
this.idleSince = null;
} else if (somethingLeftBelow) {
// console.log("scrolling"); document.body.clientHeight =+ document.body.clientHeight);
window.scrollBy(0, 200);
this.idleSince = null;
} else if (window.scrollY + window.innerHeight < document.documentElement.scrollHeight) {
// console.log("scrolling because we're not to the bottom yet");
window.scrollBy(0, 200);
this.idleSince = null;
} else if (this.idleSince == null) {
this.idleSince = Date.now();
}
}
if (!this.idleSince) {
this.idleSince = Date.now();
} else {
var idleTimeMs = Date.now() - this.idleSince;
if ((idleTimeMs / 1000) > (this.IDLE_TIMEOUT_SEC - 1) && (this.index < (this.actions.length - 1))) {
console.log("ready for next action");
this.index += 1;
this.idleSince = null;
}
}
}
aboveBelowOrOnScreen(elem) {
var eTop = elem.getBoundingClientRect().top;
if (eTop < window.scrollY) {
@ -167,7 +254,7 @@ class UmbraBehavior {
start() {
var that = this;
this.intervalId = setInterval(function() {
that.simpleIntervalFunc()
that.simplerIntervalFunc()
}, this.intervalTimeMs);
}
@ -185,7 +272,7 @@ class UmbraBehavior {
var umbraBehavior = new UmbraBehavior( {{actions|json}} );
//var umbraBehavior = new UmbraBehavior( [{'selector': 'div.teaser, li.pager__item a'}] ); // pm.gc.ca/eng/news/statements
//var umbraBehavior = new UmbraBehavior( [{'selector': 'div.teaser, li.pager__item a'}] ); // pm.gc.ca/eng/news
//var umbraBehavior = new UmbraBehavior( [{'selector': 'a#get_more'}] ); // www.thejewishnews.com/arts-life/ multi iframes, error!
// Called from outside of this script.