Compare commits
3 commits
c68045cd0e
...
4abf817f2a
Author | SHA1 | Date | |
---|---|---|---|
4abf817f2a | |||
0a0b140dd2 | |||
3fe67c37b2 |
4 changed files with 20 additions and 5 deletions
|
@ -2,6 +2,8 @@
|
|||
|
||||
import JadefinIntegrity from "./JadefinIntegrity.js";
|
||||
|
||||
import JadefinUtils from "./JadefinUtils.js";
|
||||
|
||||
import cyrb53a from "./utils/cyrb53.js";
|
||||
|
||||
export default JadefinIntegrity("JadefinLog", import.meta.url, () => class JadefinLog {
|
||||
|
@ -64,7 +66,7 @@ export default JadefinIntegrity("JadefinLog", import.meta.url, () => class Jadef
|
|||
return this;
|
||||
}
|
||||
|
||||
if (args.length == 1) {
|
||||
if (args.length == 1 && !JadefinUtils.isFF) {
|
||||
if (args[0] instanceof Error) {
|
||||
console.error(args[0]);
|
||||
} else {
|
||||
|
|
|
@ -16,6 +16,8 @@ export default JadefinIntegrity("JadefinUtils", import.meta.url, () => window["J
|
|||
/** @type {any} */
|
||||
htmlVideoPlayer = null;
|
||||
|
||||
isFF = globalThis.navigator?.userAgent.toLowerCase().includes("firefox") || false;
|
||||
|
||||
get isInMovie() {
|
||||
return !!document.querySelector(".osdHeader");
|
||||
}
|
||||
|
|
|
@ -98,7 +98,7 @@ export default JadefinIntegrity("InputEater", import.meta.url, () => new (class
|
|||
item.secondaryText = "Give up control over the party";
|
||||
}
|
||||
|
||||
return this.canBeEating;
|
||||
return this.canBeEating && current == ExtrasMenu.IN_MOVIE;
|
||||
},
|
||||
cb: () => {
|
||||
this.isEnabled = !this.isEnabled;
|
||||
|
|
|
@ -9,6 +9,8 @@ import JadefinUtils from "../../JadefinUtils.js";
|
|||
|
||||
// Thanks, Mozilla, for killing Firefox... https://bugzilla.mozilla.org/show_bug.cgi?id=1331110
|
||||
export default JadefinIntegrity("PatchFirefoxAnamorphic", import.meta.url, () => new (class PatchFirefoxAnamorphic extends JadefinMod {
|
||||
wantedWidth = 0;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
}
|
||||
|
@ -51,15 +53,22 @@ export default JadefinIntegrity("PatchFirefoxAnamorphic", import.meta.url, () =>
|
|||
}
|
||||
|
||||
if (this.video == video) {
|
||||
return this._dispatch(0);
|
||||
return this._dispatch(this.wantedWidth);
|
||||
}
|
||||
|
||||
const streams = JadefinUtils.currentPlayer?.streamInfo?.mediaSource?.MediaStreams;
|
||||
if (!streams) {
|
||||
this.log.i("Waiting for media streams");
|
||||
setTimeout(() => this.update(), 100);
|
||||
return;
|
||||
}
|
||||
|
||||
this.video = video;
|
||||
|
||||
const ratioStr = JadefinUtils.currentPlayer.streamInfo.mediaSource.MediaStreams.find(s => s.Type == "Video").AspectRatio;
|
||||
const ratioStr = streams.find(s => s.Type == "Video").AspectRatio;
|
||||
const ratioStrSplit = ratioStr && ratioStr.split(":");
|
||||
if (!ratioStrSplit || !ratioStrSplit[1]) {
|
||||
this.log.i(`Aspect ratio couldn't be determined`);
|
||||
this.log.i("Aspect ratio couldn't be determined");
|
||||
return this._dispatch(0);
|
||||
}
|
||||
|
||||
|
@ -81,6 +90,8 @@ export default JadefinIntegrity("PatchFirefoxAnamorphic", import.meta.url, () =>
|
|||
* @param {number} width
|
||||
*/
|
||||
_dispatch(width) {
|
||||
this.wantedWidth = width;
|
||||
|
||||
JadefinUtils.events.dispatchEvent(new CustomEvent("PatchFirefoxAnamorphic", {
|
||||
detail: {
|
||||
width
|
||||
|
|
Loading…
Add table
Reference in a new issue