From 5a3c8e9a05e1fb4df77d410e7a1c1ff5508c3a63 Mon Sep 17 00:00:00 2001
From: Adam Miller <adam.spokane@gmail.com>
Date: Mon, 15 Sep 2014 11:06:33 -0700
Subject: [PATCH 1/3] ARI-4016 - Support: embedded videos on marquette.edu

---
 umbra/behaviors.d/marquette_edu.js | 56 ++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 umbra/behaviors.d/marquette_edu.js

diff --git a/umbra/behaviors.d/marquette_edu.js b/umbra/behaviors.d/marquette_edu.js
new file mode 100644
index 0000000..67833d9
--- /dev/null
+++ b/umbra/behaviors.d/marquette_edu.js
@@ -0,0 +1,56 @@
+// {"url_regex":"^https?://(?:www\\.)?marquette\\.edu/.*$", "request_idle_timeout_sec":10}
+//
+// vim:set sw=8 et:
+//
+
+var umbraState = {'idleSince':null,'done':null};
+
+
+var intervalID = setInterval(scrollInterval,50);
+var images;
+var imageID=0;
+var imageCount=0;
+function scrollInterval() {
+   scroll();
+
+   //if not at the bottom
+   if(window.scrollY + window.innerHeight < document.documentElement.scrollHeight) {
+       umbraState.idleSince=Date.now();
+   }
+   else {
+       clearInterval(intervalID);
+       umbraState.idleSince=null;
+	var videoBox = document.querySelectorAll("div#vid_box a");
+	if(videoBox.length>0) {
+	    for(i=0;i<videoBox.length;i++) {
+		videoBox[i].click();
+		umbraState.idleSince=Date.now();
+	    }
+	}
+   }
+}
+
+function scroll() {
+    window.scrollBy(0,50);
+}
+
+
+// If we haven't had anything to do (scrolled, clicked, etc) in this amount of
+// time, then we consider ourselves finished with the page.
+
+var UMBRA_USER_ACTION_IDLE_TIMEOUT_SEC = 10;
+
+// Called from outside of this script.
+var umbraBehaviorFinished = function() {
+    if(umbraState.done!=null && umbraState.done==true) {
+	return true;
+    }
+    if (umbraState.idleSince != null) {
+	var idleTimeMs = Date.now() - umbraState.idleSince;
+	if (idleTimeMs / 1000 > UMBRA_USER_ACTION_IDLE_TIMEOUT_SEC) {
+	    return true;
+	}
+    }
+    return false;
+}
+    

From eb3ea95b871d2a829f8269a5734d2d4427988b58 Mon Sep 17 00:00:00 2001
From: Adam Miller <adam.spokane@gmail.com>
Date: Wed, 17 Sep 2014 15:26:13 -0700
Subject: [PATCH 2/3] Cleanup timeout logic

---
 umbra/behaviors.d/marquette_edu.js | 44 +++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/umbra/behaviors.d/marquette_edu.js b/umbra/behaviors.d/marquette_edu.js
index 67833d9..20d70ff 100644
--- a/umbra/behaviors.d/marquette_edu.js
+++ b/umbra/behaviors.d/marquette_edu.js
@@ -3,34 +3,37 @@
 // vim:set sw=8 et:
 //
 
-var umbraState = {'idleSince':null,'done':null};
-
-
-var intervalID = setInterval(scrollInterval,50);
-var images;
-var imageID=0;
-var imageCount=0;
-function scrollInterval() {
-   scroll();
+var umbraState = {'idleSince':null};
+var umbraIntervalID = setInterval(umbraScrollInterval,50);
+var umbraAlreadyClicked = {};
+function umbraScrollInterval() {
 
    //if not at the bottom
    if(window.scrollY + window.innerHeight < document.documentElement.scrollHeight) {
-       umbraState.idleSince=Date.now();
-   }
-   else {
-       clearInterval(intervalID);
+       umbraScroll();
        umbraState.idleSince=null;
-	var videoBox = document.querySelectorAll("div#vid_box a");
-	if(videoBox.length>0) {
-	    for(i=0;i<videoBox.length;i++) {
-		videoBox[i].click();
-		umbraState.idleSince=Date.now();
+   }
+   else { 
+	var videoBoxes = document.querySelectorAll("div#vid_box a");
+	var clickedVideo = false;
+	if(videoBoxes.length>0) {
+	    for(i=0;i<videoBoxes.length;i++) {
+		if(!(videoBoxes[i] in umbraAlreadyClicked)){
+		    videoBoxes[i].click();
+		    umbraState.idleSince=Date.now();
+		    umbraAlreadyClicked[videoBoxes[i]]=true;
+		    clickedVideo=true;
+		}
 	    }
 	}
+	if(!clickedVideo && umbraState.idleSince==null) {
+	    umbraState.idleSince=Date.now();
+	}
    }
+
 }
 
-function scroll() {
+function umbraScroll() {
     window.scrollBy(0,50);
 }
 
@@ -42,9 +45,6 @@ var UMBRA_USER_ACTION_IDLE_TIMEOUT_SEC = 10;
 
 // Called from outside of this script.
 var umbraBehaviorFinished = function() {
-    if(umbraState.done!=null && umbraState.done==true) {
-	return true;
-    }
     if (umbraState.idleSince != null) {
 	var idleTimeMs = Date.now() - umbraState.idleSince;
 	if (idleTimeMs / 1000 > UMBRA_USER_ACTION_IDLE_TIMEOUT_SEC) {

From 7f8e6802de931d654bb5761b50335bf996f787a5 Mon Sep 17 00:00:00 2001
From: Adam Miller <adam.spokane@gmail.com>
Date: Fri, 7 Nov 2014 15:56:05 -0800
Subject: [PATCH 3/3] Implementing suggestions in pull request.

---
 umbra/behaviors.d/marquette_edu.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/umbra/behaviors.d/marquette_edu.js b/umbra/behaviors.d/marquette_edu.js
index 20d70ff..cdaab00 100644
--- a/umbra/behaviors.d/marquette_edu.js
+++ b/umbra/behaviors.d/marquette_edu.js
@@ -16,16 +16,16 @@ function umbraScrollInterval() {
    else { 
 	var videoBoxes = document.querySelectorAll("div#vid_box a");
 	var clickedVideo = false;
-	if(videoBoxes.length>0) {
-	    for(i=0;i<videoBoxes.length;i++) {
-		if(!(videoBoxes[i] in umbraAlreadyClicked)){
-		    videoBoxes[i].click();
-		    umbraState.idleSince=Date.now();
-		    umbraAlreadyClicked[videoBoxes[i]]=true;
-		    clickedVideo=true;
-		}
+
+	for(i=0;i<videoBoxes.length;i++) {
+	    if(!(videoBoxes[i] in umbraAlreadyClicked)){
+		videoBoxes[i].click();
+		umbraState.idleSince=null;
+		umbraAlreadyClicked[videoBoxes[i]]=true;
+		clickedVideo=true;
 	    }
 	}
+
 	if(!clickedVideo && umbraState.idleSince==null) {
 	    umbraState.idleSince=Date.now();
 	}