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

onUpdated doesn't work the way we want (at least not for netflix), so instead of relying on that we just check for changes periodically.

Browse Source
This commit is contained in:
Tamius Han 2017-01-04 23:23:41 +01:00
parent 2fd4cb6701
commit e7b0f80eb2
2 changed files with 79 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/uw-bg.js
View File

@ -1,4 +1,4 @@
debugmsg = false;
debugmsg = true;
url_changed = false;
@ -10,15 +10,12 @@ function gibActiveTab(){
return browser.tabs.query({active: true, currentWindow: true});
}
var page_change_msg_count = 0;
function notifyChange(){
if(debugmsg)
console.log("uw-bg::tab updated. Did we mark for update?", url_changed);
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.
console.log("uw-bg::tab updated. seq:", page_change_msg_count++);
browser.tabs.query({active: true, currentWindow: true}, function(tabs){
browser.tabs.sendMessage(tabs[0].id, {message: "page-change"});
@ -27,6 +24,7 @@ function notifyChange(){
browser.tabs.onUpdated.addListener(notifyChange);
browser.runtime.onMessage.addListener(function(request, sender, sendResponse) {

76
js/uw.js
View File

@ -1,4 +1,5 @@
var debugmsg = true;
var debugmsg_periodic = false;
if(debugmsg){
console.log(". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ");
console.log("\nLoading ultrawidify (uw)\nIf you can see this, extension at least tried to load\n\nRandom number: ",Math.floor(Math.random() * 20) + 1,"\n");
@ -34,6 +35,14 @@ var button_size_base = "x"; // Determines if size of extension buttons is de
var video_wrap;
// Here we store the window size, so we know when to trigger css change.
var winsize = {w: window.innerWidth, h: window.innerHeight};
// provider-specific variables
var netflix_cltbar_visibility = -1; // -1 for invisible, anything non-negative for visible
var netflix_periodic_timer;
function init(force_reload){
if(debugmsg)
@ -140,6 +149,7 @@ if(page_url.indexOf("netflix.com") != -1){
//END ADDING CSS
//BEGIN keybind-related stuff
// Yeah hi /r/badcode.
// Anyway, because nazi localstorage flat out refuses to store arrays:
@ -238,9 +248,53 @@ browser.runtime.onMessage.addListener(function (message, sender, stuff ) {
// console.log(
changeCSS(last_whatdo.type, last_whatdo.what_do);
updateCtlButtonSize();
if(debugmsg)
console.log("uw::onMessage | message number:",num_of_msg," »» everything is done. Buttons: ", document.getElementsByClassName("uw-button"));
}
});
//Because onUpdated event isn't reliable enough for what we're doing on netflix.
function periodic() {
if(debugmsg_periodic)
console.log("uw::periodic started!");
if(document.getElementsByClassName("uw_element").length === 0){
if(debugmsg)
console.log("uw::periodic | no buttons detected. Readding.");
init();
addCtlButtons(0);
}
var w = window.innerWidth;
var h = window.innerHeight;
if(winsize.w != w && winsize.h != h){
console.log("uw::periodic | detected change in window size. Triggering css change");
winsize.w = w;
winsize.h = h;
changeCSS(last_whatdo.type, last_whatdo.what_do);
updateCtlButtonSize();
}
var controls = document.getElementsByClassName("player-controls-wrapper")[0];
if(controls){
if(debugmsg_periodic)
console.log("uw::periodic | we found controls!");
var ind = controls.className.indexOf("display-none");
if(debugmsg_periodic)
console.log("uw::periodic | ind:",ind,"last ind:",netflix_cltbar_visibility);
// controls must be visible. We must have not called updateCtlButtonSize before.
if( ind != netflix_cltbar_visibility ){
if(debugmsg)
console.log("uw::periodic | toggled visibility");
netflix_cltbar_visibility = ind;
if(ind == -1)
updateCtlButtonSize();
}
}
}
// browser.runtime.onMessage.addListener(request => {
// console.log("Message from the background script:");
// console.log(request.greeting);
@ -284,6 +338,14 @@ function extSetup(){
keydownSetup();
addCtlButtons(0);
if(page_url.indexOf("netflix.com") != -1){
console.log("uw::extSetup | starting netflix-specific setup steps");
if(netflix_periodic_timer)
clearInterval(netflix_periodic_timer);
netflix_periodic_timer = setInterval(function(){ periodic(); }, 100);
}
if(debugmsg)
console.log("======================================[ setup finished ]======================================");
}
@ -397,6 +459,9 @@ function addCtlButtons(recursion_depth){
var button_width = document.getElementsByClassName(sample_button_class)[sample_button_index].scrollHeight;
else
var button_width = document.getElementsByClassName(sample_button_class)[sample_button_index].scrollWidth;
if(debugmsg)
console.log("uw::addCtlButtons | width of the element is ", button_width , "and is based on the height of this element:", document.getElementsByClassName(sample_button_class)[sample_button_index], " <extra tags: onMessage>")
}
catch(e){
// Zato, ker predvajalnik ni vselej prisoten. Če predvajalnik ni prisoten,
@ -497,6 +562,7 @@ function addCtlButtons(recursion_depth){
buttons[i].style.backgroundImage = 'url(' + resourceToUrl("/res/img/ytplayer-icons/" + button_def[i] + ".png") + ')';
buttons[i].style.width = (button_width * 0.75) + "px";
buttons[i].style.height = (button_width) + "px";
buttons[i].style.width = 0;
// buttons[i].style.marginLeft = (button_width * 0.3) + "px";
buttons[i].style.paddingLeft = (button_width *0.15 ) + "px";
buttons[i].style.paddingRight = (button_width * 0.15) + "px";
@ -778,9 +844,15 @@ function changeCSS(type, what_do){
hideMenu("uw-smenu");
var evideo = $("video")[0];
var video = { "width": $("video")[0].scrollWidth, "height": $("video")[0].scrollHeight };
if(!evideo){
if(debugmsg)
console.log("uw::changeCSS | no video element found. Doing nothing.");
return;
}
var video = { "width": evideo.scrollWidth, "height": evideo.scrollHeight };
var nplayer = { "width": player.clientWidth, "height": player.clientHeight }