Merge branch 'master' of https://github.com/Warren-Partridge/ocubrowse

pulling code before merging
warren · Dec 3, 2018 · d30ca42 · d30ca42
2 parents 8a85153 + 9bfa237
commit d30ca42
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 16 deletions.
diff --git a/chromeExtension/js/background.js b/chromeExtension/js/background.js
@@ -27,4 +27,55 @@
 //     console.log("spaghetti");
 //     sendResponse({farewell: "goodbye"});
 //     chrome.tabs.goBack();
-//   });
+//   });
+
+//
+// window.onload=function(){
+//   console.log("page load!");
+// }
+
+
+chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+    console.log('The request has been received from the content script.');
+    chrome.tabs.executeScript({
+      file: "js/jquery.min.js"
+    });
+    chrome.tabs.executeScript({
+      file: "js/webgazer.js"
+    });
+    chrome.tabs.executeScript({
+      file: "js/makeBackButtonOverlay.js"
+    });
+    chrome.tabs.executeScript({
+      file: "js/makeClickButtonOverlay.js"
+    });
+    chrome.tabs.executeScript({
+      file: "js/start.js"
+    });
+});
+
+
+// chrome.tabs.onUpdated.addListener( function (tabId, changeInfo, tab) {
+//   if (changeInfo.status == 'complete') {
+//
+//   }
+// });
+
+//
+// window.onload=function(){
+//   chrome.tabs.executeScript({
+//     file: "js/jquery.min.js"
+//   });
+//   chrome.tabs.executeScript({
+//     file: "js/webgazer.js"
+//   });
+//   chrome.tabs.executeScript({
+//     file: "js/makeBackButtonOverlay.js"
+//   });
+//   chrome.tabs.executeScript({
+//     file: "js/makeClickButtonOverlay.js"
+//   });
+//   chrome.tabs.executeScript({
+//     file: "js/start.js"
+//   });
+// };
diff --git a/chromeExtension/js/content.js b/chromeExtension/js/content.js
@@ -0,0 +1,9 @@
+// setTimeout(function(){ chrome.runtime.sendMessage({ from: 'content', message: 'Information from webpage.' }); }, 3000);
+
+chrome.runtime.sendMessage(
+    "foo",
+    function( response ) {
+        console.log(response);
+    } );
+    // { from: 'content', message: 'Information from webpage.' });
+console.log("yay sent runtime message");
diff --git a/chromeExtension/js/makeBackButtonOverlay.js b/chromeExtension/js/makeBackButtonOverlay.js
@@ -11,15 +11,41 @@ myDiv.style.border = "5px solid rgb(171, 46, 185)";
 myDiv.style.opacity = "100%";
 myDiv.style.borderRadius = "10px";
 myDiv.style.top = "30%";
-myDiv.style.left = "2%";
+myDiv.style.left = "0.5%";
 myDiv.style.width = "300px";
 myDiv.style.height = "300px";
 myDiv.style.textAlign = "center";
 myDiv.style.display = "table";
 
 myP.style.display = "table-cell";
 myP.style.verticalAlign = "middle";
-myP.innerText = "hover me to go back";
+myP.innerText = "Hover me to go back";
 
 
 document.body.appendChild(myDiv);
+
+var topDiv = document.createElement("div");
+var botDiv = document.createElement("div");
+
+topDiv.style.background = "rgba(255, 255, 0, 0)";
+topDiv.style.position = "fixed";
+topDiv.style.border = "5px solid rgb(255, 255, 0)";
+topDiv.style.opacity = "100%";
+topDiv.style.borderRadius = "10px";
+topDiv.style.top = "0%";
+topDiv.style.width = "100%";
+topDiv.style.height = "12%";
+topDiv.style.display = "table";
+
+botDiv.style.background = "rgba(255, 255, 0, 0)";
+botDiv.style.position = "fixed";
+botDiv.style.border = "5px solid rgb(255, 255, 0)";
+botDiv.style.opacity = "100%";
+botDiv.style.borderRadius = "10px";
+botDiv.style.top = "88%";
+botDiv.style.width = "100%";
+botDiv.style.height = "12%";
+botDiv.style.display = "table";
+
+document.body.appendChild(topDiv);
+document.body.appendChild(botDiv);
diff --git a/chromeExtension/js/makeClickButtonOverlay.js b/chromeExtension/js/makeClickButtonOverlay.js
@@ -19,7 +19,7 @@ myDiv.style.display = "table";
 
 myP.style.display = "table-cell";
 myP.style.verticalAlign = "middle";
-myP.innerText = "hover me to click";
+myP.innerText = "Hover me to click";
 
 
 document.body.appendChild(myDiv);
diff --git a/chromeExtension/js/popup.js b/chromeExtension/js/popup.js
@@ -19,3 +19,46 @@ function startWebgazer() {
 document
   .getElementById("start-webgazer")
   .addEventListener("click", startWebgazer);
+
+
+
+
+
+// chrome.tabs.onUpdated.addListener( function (tabId, changeInfo, tab) {
+//   if (changeInfo.status == 'complete') {
+//     chrome.tabs.executeScript({
+//       file: "js/jquery.min.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/webgazer.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/makeBackButtonOverlay.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/makeClickButtonOverlay.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/start.js"
+//     });
+//   }
+// });
+
+
+// window.onload=function(){
+//     chrome.tabs.executeScript({
+//       file: "js/jquery.min.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/webgazer.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/makeBackButtonOverlay.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/makeClickButtonOverlay.js"
+//     });
+//     chrome.tabs.executeScript({
+//       file: "js/start.js"
+//     });
+// };
diff --git a/chromeExtension/manifest.json b/chromeExtension/manifest.json
@@ -17,18 +17,19 @@
     "128": "icons/icon128.png"
   },
 
-//    "background": {
-//     "scripts": ["js/background.js"]
-  // "persistent": false
-//    },
+  "background": {
+   "scripts": ["js/background.js"],
+  "persistent": true
+  },
 
-//  "content_scripts": [{
-//  "js": ["js/start.js"],
+  "content_scripts": [{
+  "js": ["js/content.js"],
   //"css": ["styles/styles.css"],
-  //"matches": ["<all_urls>"]
-//  }],
+  "matches": ["<all_urls>"],
+    "run_at": "document_end"
+  }],
 
   //  "browser_action": {},
 
-  "permissions": ["activeTab", "history"]
+  "permissions": ["activeTab", "history", "https://ajax.googleapis.com/", "*://*/*"]
 }
diff --git a/devSite/views/index.hbs b/devSite/views/index.hbs
@@ -31,9 +31,7 @@
         </div>
         <div class="row" id="buttons">
           <div class="col-md">
-            <button type="button" class="btn btn-secondary">
-              Download
-            </button>
+            <a href="https://github.com/Warren-Partridge/ocubrowse" class="btn btn-secondary">Download</a>
             <button type="button" class="btn btn-secondary" style="margin-left:30px;">
               Callibrate
             </button>