tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keypresses are fixed again. Probably.

Browse Source
This commit is contained in:
Tamius Han 2017-01-02 17:45:51 +01:00
parent 5bd797895c
commit 991759f0a0
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/uw-bg.js
View File

@ -18,15 +18,11 @@ function notifyChange(){
if(url_changed) //we've already set the proverbial fuse, no need to trigger the function multiple times if(url_changed) //we've already set the proverbial fuse, no need to trigger the function multiple times
return; 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.query({active: true, currentWindow: true}, function(tabs){
browser.tabs.sendMessage(tabs[0].id, {message: "page-change"}); browser.tabs.sendMessage(tabs[0].id, {message: "page-change"});
}); });
setTimeout(function(){url_changed = false;}, 100);
}, 3000);
} }

22
js/uw.js
View File

@ -54,7 +54,7 @@ function init(){
player = document.getElementById("movie_player"); player = document.getElementById("movie_player");
video_wrap = "video-stream"; video_wrap = "video-stream";
return; return true;
} }
//Netflix: //Netflix:
@ -84,7 +84,11 @@ function init(){
sample_button_class = "player-control-button player-fill-screen"; sample_button_class = "player-control-button player-fill-screen";
video_wrap = "player-video-wrapper"; video_wrap = "player-video-wrapper";
button_size_base = "y"; button_size_base = "y";
return true;
} }
return false;
} }
@ -210,9 +214,10 @@ ask4keybinds.then( (res) => {
if(debugmsg) if(debugmsg)
console.log("uw | Setting up comms with background scripts"); console.log("uw | Setting up comms with background scripts");
var num_of_msg = 0;
browser.runtime.onMessage.addListener(function (message, sender, stuff ) { browser.runtime.onMessage.addListener(function (message, sender, stuff ) {
if(debugmsg) 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"){ if(message.message == "page-change"){
addCtlButtons(0); addCtlButtons(0);
@ -247,13 +252,19 @@ function extSetup(){
if(debugmsg){ if(debugmsg){
console.log("uw::extSetup | our current location is:", last_location); 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)"); 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"); $(document).off("keydown");
if(debugmsg) if(debugmsg)
console.log("uw::extSetup | setting up keyboard shortcuts"); console.log("uw::extSetup | setting up keyboard shortcuts");
if(init())
keydownSetup(); keydownSetup();
addCtlButtons(0); addCtlButtons(0);
if(debugmsg) if(debugmsg)
@ -261,6 +272,8 @@ function extSetup(){
} }
function keydownSetup(){ function keydownSetup(){
if(debugmsg)
console.log("uw::keydownSetup | starting keybord shortcut setup");
$(document).keydown(function (event) { // Tukaj ugotovimo, katero tipko smo pritisnili $(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 // 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(){ function showSettings(){
var prettypls = browser.runtime.openOptionsPage();
prettypls.then(onOpen, onError);
} }
// Ta funkcija se proži, ko vstopimo ali izstopimo iz celozaslonskega načina // Ta funkcija se proži, ko vstopimo ali izstopimo iz celozaslonskega načina