marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-06-06 07:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't render MKB settings on unsupported devices

Browse Source
This commit is contained in:
redphx 2024-10-08 07:01:58 +07:00
parent 1e6527413c
commit 98fa273b48
6 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dist/better-xcloud.lite.user.js vendored
View File

@ -120,7 +120,7 @@ function deepClone(obj) {
}
var SCRIPT_VERSION = "5.8.1-beta", SCRIPT_VARIANT = "lite", AppInterface = window.AppInterface;
UserAgent.init();
var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, STATES = {
var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, supportMkb = AppInterface || !userAgent.match(/(android|iphone|ipad)/), STATES = {
supportedRegion: !0,
serverRegions: {},
selectedRegion: {},
@ -137,7 +137,8 @@ var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.inclu
userAgent: {
isTv,
capabilities: {
touch: userAgentHasTouchSupport
touch: userAgentHasTouchSupport,
mkb: supportMkb
}
},
currentStream: {},
@ -1375,10 +1376,7 @@ class GlobalSettingsStorage extends BaseSettingsStore {
requiredVariants: "full",
label: t("enable-mkb"),
default: !1,
unsupported: (() => {
const userAgent2 = (window.navigator.orgUserAgent || window.navigator.userAgent || "").toLowerCase();
return !AppInterface && userAgent2.match(/(android|iphone|ipad)/) ? t("browser-unsupported-feature") : !1;
})(),
unsupported: !STATES.userAgent.capabilities.mkb,
ready: (setting) => {
let note, url;
if (setting.unsupported) note = t("browser-unsupported-feature"), url = "https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657";
@ -3271,6 +3269,11 @@ class SettingsNavigationDialog extends NavigationDialog {
requiredVariants: "full",
group: "mkb",
label: t("mouse-and-keyboard"),
note: !STATES.userAgent.capabilities.mkb ? CE("a", {
href: "https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657",
target: "_blank"
}, "⚠️ " + t("browser-unsupported-feature")) : null,
unsupported: !STATES.userAgent.capabilities.mkb,
items: [
"native_mkb_enabled",
"game_msfs2020_force_native_mkb",
@ -3914,9 +3917,7 @@ class SettingsNavigationDialog extends NavigationDialog {
$tabContent.appendChild($title);
}
if (settingTabContent.note) {
let $note;
if (typeof settingTabContent.note === "string") $note = CE("b", { class: "bx-note-unsupported" }, settingTabContent.note);
else $note = settingTabContent.note;
const $note = CE("b", { class: "bx-note-unsupported" }, settingTabContent.note);
$tabContent.appendChild($note);
}
if (settingTabContent.unsupported) continue;

19
dist/better-xcloud.user.js vendored
View File

@ -122,7 +122,7 @@ function deepClone(obj) {
}
var SCRIPT_VERSION = "5.8.1-beta", SCRIPT_VARIANT = "full", AppInterface = window.AppInterface;
UserAgent.init();
var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, STATES = {
var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, supportMkb = AppInterface || !userAgent.match(/(android|iphone|ipad)/), STATES = {
supportedRegion: !0,
serverRegions: {},
selectedRegion: {},
@ -139,7 +139,8 @@ var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.inclu
userAgent: {
isTv,
capabilities: {
touch: userAgentHasTouchSupport
touch: userAgentHasTouchSupport,
mkb: supportMkb
}
},
currentStream: {},
@ -1402,10 +1403,7 @@ class GlobalSettingsStorage extends BaseSettingsStore {
requiredVariants: "full",
label: t("enable-mkb"),
default: !1,
unsupported: (() => {
const userAgent2 = (window.navigator.orgUserAgent || window.navigator.userAgent || "").toLowerCase();
return !AppInterface && userAgent2.match(/(android|iphone|ipad)/) ? t("browser-unsupported-feature") : !1;
})(),
unsupported: !STATES.userAgent.capabilities.mkb,
ready: (setting) => {
let note, url;
if (setting.unsupported) note = t("browser-unsupported-feature"), url = "https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657";
@ -4652,6 +4650,11 @@ class SettingsNavigationDialog extends NavigationDialog {
requiredVariants: "full",
group: "mkb",
label: t("mouse-and-keyboard"),
note: !STATES.userAgent.capabilities.mkb ? CE("a", {
href: "https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657",
target: "_blank"
}, "⚠️ " + t("browser-unsupported-feature")) : null,
unsupported: !STATES.userAgent.capabilities.mkb,
items: [
"native_mkb_enabled",
"game_msfs2020_force_native_mkb",
@ -5347,9 +5350,7 @@ class SettingsNavigationDialog extends NavigationDialog {
$tabContent.appendChild($title);
}
if (settingTabContent.note) {
let $note;
if (typeof settingTabContent.note === "string") $note = CE("b", { class: "bx-note-unsupported" }, settingTabContent.note);
else $note = settingTabContent.note;
const $note = CE("b", { class: "bx-note-unsupported" }, settingTabContent.note);
$tabContent.appendChild($note);
}
if (settingTabContent.unsupported) continue;

12
src/modules/ui/dialog/settings-dialog.ts
View File

@ -220,6 +220,11 @@ export class SettingsNavigationDialog extends NavigationDialog {
requiredVariants: 'full',
group: 'mkb',
label: t('mouse-and-keyboard'),
note: !STATES.userAgent.capabilities.mkb ? CE('a', {
href: 'https://github.com/redphx/better-xcloud/issues/206#issuecomment-1920475657',
target: '_blank',
}, '⚠️ ' + t('browser-unsupported-feature')) : null,
unsupported: !STATES.userAgent.capabilities.mkb,
items: [
PrefKey.NATIVE_MKB_ENABLED,
PrefKey.GAME_MSFS2020_FORCE_NATIVE_MKB,
@ -1336,12 +1341,7 @@ export class SettingsNavigationDialog extends NavigationDialog {
// Add note
if (settingTabContent.note) {
let $note;
if (typeof settingTabContent.note === 'string') {
$note = CE('b', {class: 'bx-note-unsupported'}, settingTabContent.note);
} else {
$note = settingTabContent.note;
}
const $note = CE('b', {class: 'bx-note-unsupported'}, settingTabContent.note);
$tabContent.appendChild($note);
}

1
src/types/index.d.ts vendored
View File

@ -46,6 +46,7 @@ type BxStates = {
isTv: boolean;
capabilities: {
touch: boolean;
mkb: boolean;
};
};

2
src/utils/global.ts
View File

@ -13,6 +13,7 @@ const isTv = userAgent.includes('smart-tv') || userAgent.includes('smarttv') ||
const isVr = window.navigator.userAgent.includes('VR') && window.navigator.userAgent.includes('OculusBrowser');
const browserHasTouchSupport = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
const userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport;
const supportMkb = AppInterface || !userAgent.match(/(android|iphone|ipad)/);
export const STATES: BxStates = {
supportedRegion: true,
@ -35,6 +36,7 @@ export const STATES: BxStates = {
isTv: isTv,
capabilities: {
touch: userAgentHasTouchSupport,
mkb: supportMkb,
}
},

5
src/utils/settings-storages/global-settings-storage.ts
View File

@ -393,10 +393,7 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
requiredVariants: 'full',
label: t('enable-mkb'),
default: false,
unsupported: ((): string | boolean => {
const userAgent = ((window.navigator as any).orgUserAgent || window.navigator.userAgent || '').toLowerCase();
return !AppInterface && userAgent.match(/(android|iphone|ipad)/) ? t('browser-unsupported-feature') : false;
})(),
unsupported: !STATES.userAgent.capabilities.mkb,
ready: (setting: SettingDefinition) => {
let note;
let url;