From 991759f0a03a1bc2a598be9d9465b637f8531e63 Mon Sep 17 00:00:00 2001
From: Tamius Han <zp8324@student.uni-lj.si>
Date: Mon, 2 Jan 2017 17:45:51 +0100
Subject: [PATCH] Keypresses are fixed again. Probably.

---
 js/uw-bg.js | 12 ++++--------
 js/uw.js    | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/js/uw-bg.js b/js/uw-bg.js
index 89332df..2509b96 100644
--- a/js/uw-bg.js
+++ b/js/uw-bg.js
@@ -18,15 +18,11 @@ function notifyChange(){
   if(url_changed)   //we've already set the proverbial fuse, no need to trigger the function multiple times
     return;
   
-  url_changed = true;  // We mark that the page was changed. We wait for a while before triggering changes.
+//   url_changed = true;  // We mark that the page was changed. We wait for a while before triggering changes.
   
-  setTimeout(function() { 
-    console.log("uw-bg::sending a message");
-    browser.tabs.query({active: true, currentWindow: true}, function(tabs){
-      browser.tabs.sendMessage(tabs[0].id, {message: "page-change"});
-    });
-    setTimeout(function(){url_changed = false;}, 100);
-  }, 3000);
+  browser.tabs.query({active: true, currentWindow: true}, function(tabs){
+    browser.tabs.sendMessage(tabs[0].id, {message: "page-change"});
+  });
 }
 
 
diff --git a/js/uw.js b/js/uw.js
index 3354647..6fbd124 100644
--- a/js/uw.js
+++ b/js/uw.js
@@ -54,7 +54,7 @@ function init(){
       player = document.getElementById("movie_player");
     
     video_wrap = "video-stream";
-    return; 
+    return true; 
   }
   
   //Netflix:
@@ -84,7 +84,11 @@ function init(){
     sample_button_class = "player-control-button player-fill-screen";
     video_wrap = "player-video-wrapper";
     button_size_base = "y";
+    
+    return true;
   }
+  
+  return false;
 }
 
 
@@ -210,9 +214,10 @@ ask4keybinds.then( (res) => {
 if(debugmsg)
   console.log("uw | Setting up comms with background scripts");
 
+var num_of_msg = 0;
 browser.runtime.onMessage.addListener(function (message, sender, stuff ) {
   if(debugmsg)
-    console.log("uw::onMessage | message:", message.message, "sender:", sender);
+    console.log("uw::onMessage | message number: ", num_of_msg++  , "; message:", message.message, "player-status elements:", document.getElementsByClassName("player-status").length, document.getElementsByClassName("player-status"));
   
   if(message.message == "page-change"){
     addCtlButtons(0);
@@ -247,20 +252,28 @@ function extSetup(){
   
   if(debugmsg){
     console.log("uw::extSetup | our current location is:", last_location);
+    console.log("uw::extSetup | initiating extension");
+  }
+  var ini = init();
+  
+  if(debugmsg){
+    console.log("uw::extSetup | init exited with", ini);
     console.log("uw::extSetup | removing existing keydown event from document (useful if extension was previously loaded and we navigated to a different video)");
   }
   $(document).off("keydown");
   
   if(debugmsg)
     console.log("uw::extSetup | setting up keyboard shortcuts");
-  if(init())
-    keydownSetup();
+  
+  keydownSetup();  
   addCtlButtons(0);
   if(debugmsg)
     console.log("======================================[ setup finished ]======================================");
 }
 
 function keydownSetup(){
+  if(debugmsg)
+    console.log("uw::keydownSetup | starting keybord shortcut setup");
   $(document).keydown(function (event) {          // Tukaj ugotovimo, katero tipko smo pritisnili
     
     // Tipke upoštevamo samo, če smo v celozaslonskem načinu oz. če ne pišemo komentarja
@@ -665,8 +678,7 @@ function onError(err){
 }
 
 function showSettings(){
-  var prettypls = browser.runtime.openOptionsPage();
-  prettypls.then(onOpen, onError);
+  
 }
 
 // Ta funkcija se proži, ko vstopimo ali izstopimo iz celozaslonskega načina