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

some more testing stuff for testers

Browse Source
This commit is contained in:
Tamius Han 2018-04-22 15:11:48 +02:00
parent 64e28e8074
commit 596ca021ba
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/modules/Resizer.js
View File

@ -47,7 +47,10 @@ var _res_char = function(newAr, video, player){
// Skrbi za "stare" možnosti, kot na primer "na širino zaslona", "na višino zaslona" in "ponastavi". // Skrbi za "stare" možnosti, kot na primer "na širino zaslona", "na višino zaslona" in "ponastavi".
// Približevanje opuščeno. // Približevanje opuščeno.
// handles "legacy" options, such as 'fit to widht', 'fit to height' and 'reset'. No zoom tho // handles "legacy" options, such as 'fit to widht', 'fit to height' and 'reset'. No zoom tho
var _res_legacyAr = function(action){ var _res_legacyAr = function(action){
if (!vid) {
return;
}
var vid = GlobalVars.video; var vid = GlobalVars.video;
var ar; var ar;
@ -354,6 +357,7 @@ var _res_antiCssOverride = function(){
if(styleArray[i] != GlobalVars.currentCss.top){ if(styleArray[i] != GlobalVars.currentCss.top){
if(Debug.debug){ if(Debug.debug){
console.log("[Resizer::_res_antiCssOverride] SOMEBODY TOUCHED MA SPAGHETT (our CSS got overriden, restoring our css)"); console.log("[Resizer::_res_antiCssOverride] SOMEBODY TOUCHED MA SPAGHETT (our CSS got overriden, restoring our css)");
console.log("[Resizer::_res_antiCssOverride] MA SPAGHETT:", GlobalVars.currentCss.toString(), "thing that touched ma spaghett", styleArrayStr)
} }
_res_restore(); _res_restore();
return; return;
@ -382,6 +386,9 @@ var _res_antiCssOverride = function(){
} }
var _res_restore = function(){ var _res_restore = function(){
if(! GlobalVars.video)
return false;
if(Debug.debug){ if(Debug.debug){
console.log("[Resizer::_res_restore] attempting to restore aspect ratio. this & settings:", {'this': this, "settings": Settings} ); console.log("[Resizer::_res_restore] attempting to restore aspect ratio. this & settings:", {'this': this, "settings": Settings} );
} }
@ -406,6 +413,8 @@ var _res_restore = function(){
GlobalVars.lastAr = storeLastAr; GlobalVars.lastAr = storeLastAr;
// ArDetect.init(); // ArDetect.init();
} }
return true;
} }
var _res_reset = function(){ var _res_reset = function(){

6
js/uw.js
View File

@ -111,7 +111,7 @@ function ghettoOnChange(){
} }
} }
if(GlobalVars.video === null) if(! GlobalVars.video)
return; return;
if(GlobalVars.playerDimensions == null){ if(GlobalVars.playerDimensions == null){
@ -138,7 +138,7 @@ function ghettoOnChange(){
return; return;
} }
Resizer.restore(); Resizer.restore(); // note: this returns true if change goes through, false otherwise.
} }
// sometimes, checkPlayerSizeChange might not detect a change to fullscreen. This means we need to // sometimes, checkPlayerSizeChange might not detect a change to fullscreen. This means we need to
@ -169,7 +169,7 @@ function ghettoUrlWatcher(){
GlobalVars.video = null; GlobalVars.video = null;
GlobalVars.lastUrl = window.location.href; GlobalVars.lastUrl = window.location.href;
Resizer.reset(); // Resizer.reset();
main(); main();
} }
} }