It took some persuading to make it work both in Chrome and Firefox at the same time. Fuck Chrome.

This commit is contained in:
Tamius Han 2017-01-21 22:53:12 +01:00
parent ebbd575d67
commit 4a331e0010
4 changed files with 35 additions and 21 deletions

View File

@ -11,7 +11,7 @@ if(debugmsg){
} }
if(browser_autodetect){ if(browser_autodetect){
if(!browser){ // This means we're probably not on Firefox. if(typeof browser === "undefined"){ // This means we're probably not on Firefox, but on nazi chrome
if(chrome){ if(chrome){
browser = chrome; browser = chrome;
usebrowser = "chrome"; usebrowser = "chrome";

View File

@ -26,7 +26,7 @@ if(debugmsg || debugmsg_click || debugmsg_message || debugmsg_autoar){
} }
if(browser_autodetect){ if(browser_autodetect){
if(!browser){ // This means we're probably not on Firefox. if(typeof browser === "undefined"){ // This means we're probably not on Firefox.
if(chrome){ if(chrome){
browser = chrome; browser = chrome;
usebrowser = "chrome"; usebrowser = "chrome";
@ -71,6 +71,7 @@ var char_strat = "contain";
var char_got_ar = false; var char_got_ar = false;
var char_arx; var char_arx;
var char_ary; var char_ary;
var autoar_enabled;
var video_wrap; var video_wrap;
@ -472,8 +473,8 @@ function loadFromStorage(){
console.log("uw::loadFromStorage | loading stuff from storage."); console.log("uw::loadFromStorage | loading stuff from storage.");
if(usebrowser == "chrome"){ if(usebrowser == "chrome"){
browser.storage.local.get("ultrawidify_autoar", function(data){extsetup_autoar(data)}); browser.storage.local.get("ultrawidify_autoar", function(data){console.log("storage.get answered with data:",data); extsetup_autoar(data)});
browser.storage.local.get("ultrawidify_keybinds", extsetup_keybinds); browser.storage.local.get("ultrawidify_keybinds", function(data){console.log("storage.get answered with data:",data); extsetup_keybinds(data)});
} }
else{ else{
browser.storage.local.get("ultrawidify_autoar").then(function(opt){ browser.storage.local.get("ultrawidify_autoar").then(function(opt){
@ -565,17 +566,24 @@ function keydownSetup(){
function extsetup_autoar(opt){ function extsetup_autoar(opt){
if(usebrowser == "chrome")
obj = opt;
else
obj = opt[0];
//Naslov resetiramo v vsakem primeru //Naslov resetiramo v vsakem primeru
//We always reset the title //We always reset the title
title = ""; title = "";
if(opt[0].ultrawidify_autoar === undefined){ if(obj === undefined)
return;
if(obj.ultrawidify_autoar === undefined){
if(debugmsg || debugmsg_autoar) if(debugmsg || debugmsg_autoar)
console.log("uw::extsetup_autoar | autoar setting unavailavle in storage. Setting defaults."); console.log("uw::extsetup_autoar | autoar setting unavailavle in storage. Setting defaults.");
browser.storage.local.set({ultrawidify_autoar: uw_autoar_default}); browser.storage.local.set({ultrawidify_autoar: uw_autoar_default});
autoar_enabled = uw_autoar_default; autoar_enabled = uw_autoar_default;
} }
else else
autoar_enabled = opt[0].ultrawidify_autoar; autoar_enabled = obj.ultrawidify_autoar;
if(debugmsg || debugmsg_autoar) if(debugmsg || debugmsg_autoar)
console.log("uw::extsetup_autoar | autoar",(autoar_enabled ? "enabled":"disabled"),"opt: ",opt); console.log("uw::extsetup_autoar | autoar",(autoar_enabled ? "enabled":"disabled"),"opt: ",opt);
@ -585,7 +593,12 @@ function extsetup_autoar(opt){
} }
function extsetup_keybinds(res){ function extsetup_keybinds(res){
if(!uw_keybinds_storage_set && (jQuery.isEmptyObject(res[0]) || jQuery.isEmptyObject(res[0].ultrawidify_keybinds)) ){ if(usebrowser == "chrome")
obj = res;
else
obj = res[0];
if(typeof uw_keybinds_storage_set === "undefined" && (jQuery.isEmptyObject(obj) || jQuery.isEmptyObject(obj.ultrawidify_keybinds)) ){
if(debugmsg) if(debugmsg)
console.log("uw::<init keybinds> | No keybindings found. Loading default keybinds as keybinds"); console.log("uw::<init keybinds> | No keybindings found. Loading default keybinds as keybinds");
@ -594,20 +607,20 @@ function extsetup_keybinds(res){
uw_keybinds_storage_set = true; uw_keybinds_storage_set = true;
} }
else{ else{
if(Object.keys(res[0].ultrawidify_keybinds).length == Object.keys(DEFAULT_KEYBINDINGS).length) if(Object.keys(obj.ultrawidify_keybinds).length == Object.keys(DEFAULT_KEYBINDINGS).length)
KEYBINDS = res[0].ultrawidify_keybinds; KEYBINDS = obj.ultrawidify_keybinds;
else{ else{
KEYBINDS = res[0].ultrawidify_keybinds; KEYBINDS = obj.ultrawidify_keybinds;
// remap 4:3 keybind from 'a' to 'c', but only if the keybind wasn't changed // remap 4:3 keybind from 'a' to 'c', but only if the keybind wasn't changed
var old_keybinds = Object.keys(res[0].ultrawidify_keybinds); var old_keybinds = Object.keys(obj.ultrawidify_keybinds);
if(KEYBINDS[old_keybinds-1].key == "a" && KEYBINDS[old_keybinds-1].modifiers == []){ if(KEYBINDS[old_keybinds-1].key == "a" && KEYBINDS[old_keybinds-1].modifiers == []){
KEYBINDS[old_keybinds-1].key == "c"; KEYBINDS[old_keybinds-1].key == "c";
} }
KEYBINDS[old_keybinds] = {action: "autoar", key: "a", modifiers: []}; KEYBINDS[old_keybinds] = {action: "autoar", key: "a", modifiers: []};
} }
} }
// console.log("res. ", res[0].ultrawidify_keybinds); // console.log("res. ", obj.ultrawidify_keybinds);
} }
//BEGIN UI //BEGIN UI
@ -992,10 +1005,11 @@ function updateCtlButtonSize(){
console.log("uw::updateCtlButtonSize | changing css of menu items"); console.log("uw::updateCtlButtonSize | changing css of menu items");
var settings_menu = document.getElementById("uw-smenu"); var settings_menu = document.getElementById("uw-smenu");
settings_menu.style.bottom = (button_width * 1.5) + "px"; if(settings_menu != null){
settings_menu.style.width = smenu_item_width + "px"; settings_menu.style.bottom = (button_width * 1.5) + "px";
settings_menu.style.fontSize = smenu_item_fontSize + "px"; settings_menu.style.width = smenu_item_width + "px";
settings_menu.style.fontSize = smenu_item_fontSize + "px";
}
// smenu_ar_menu.style.right = smenu_item_width + "px"; // smenu_ar_menu.style.right = smenu_item_width + "px";
// smenu_ar_menu.style.width = smenu_ar_item_width + "px"; // smenu_ar_menu.style.width = smenu_ar_item_width + "px";
// smenu_ar_menu.style.bottom = "0px"; // smenu_ar_menu.style.bottom = "0px";

View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Ultrawidify-git", "name": "Ultrawidify-git",
"version": "1.2.1dev", "version": "1.2.1",
"icons": { "icons": {
"32":"res/icons/uw-32.png", "32":"res/icons/uw-32.png",

View File

@ -2,10 +2,10 @@ var browser_autodetect = true;
var usebrowser = "chrome"; var usebrowser = "chrome";
if(browser_autodetect){ if(browser_autodetect){
if(!browser){ // This means we're probably not on Firefox. if(typeof browser === "undefined"){ // This means we're probably not on Firefox, but on nazi chrome
if(chrome){ if(chrome){ // in glorious Firefox, 'typeof browser === "undefined"' spaghetti would
browser = chrome; browser = chrome; // only be if (!browser) gg
usebrowser = "chrome"; usebrowser = "chrome"; // google chrome is really the untermensch browser
} }
} }
else else