rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge with browser fixes from RossMods

Browse Source
This commit is contained in:
Cohee
2024-10-17 21:25:50 +03:00
parent 34ff8e239f
commit f897a4ab1a
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@ -1,4 +1,4 @@
import { humanizedDateTime, favsToHotswap, getMessageTimeStamp, dragElement, isMobile, initRossMods, shouldSendOnEnter, addSafariPatch } from './scripts/RossAscends-mods.js'; import { humanizedDateTime, favsToHotswap, getMessageTimeStamp, dragElement, isMobile, initRossMods, shouldSendOnEnter } from './scripts/RossAscends-mods.js';
import { userStatsHandler, statMesProcess, initStats } from './scripts/stats.js'; import { userStatsHandler, statMesProcess, initStats } from './scripts/stats.js';
import { import {
generateKoboldWithStreaming, generateKoboldWithStreaming,
@ -273,7 +273,6 @@ await new Promise((resolve) => {
}); });
showLoader(); showLoader();
applyBrowserFixes();
// Configure toast library: // Configure toast library:
toastr.options.escapeHtml = true; // Prevent raw HTML inserts toastr.options.escapeHtml = true; // Prevent raw HTML inserts
@ -940,7 +939,7 @@ async function firstLoadInit() {
throw new Error('Initialization failed'); throw new Error('Initialization failed');
} }
addSafariPatch(); applyBrowserFixes();
await getClientVersion(); await getClientVersion();
await readSecretState(); await readSecretState();
await initLocales(); await initLocales();

24
public/scripts/RossAscends-mods.js
View File

@ -121,7 +121,7 @@ export function humanizeGenTime(total_gen_time) {
*/ */
var parsedUA = null; var parsedUA = null;
function getParsedUA() { export function getParsedUA() {
if (!parsedUA) { if (!parsedUA) {
try { try {
parsedUA = Bowser.parse(navigator.userAgent); parsedUA = Bowser.parse(navigator.userAgent);
@ -717,18 +717,6 @@ export const autoFitSendTextAreaDebounced = debounce(autoFitSendTextArea, deboun
// --------------------------------------------------- // ---------------------------------------------------
export function addSafariPatch() {
const userAgent = getParsedUA();
console.debug('User Agent', userAgent);
const isMobileSafari = /iPad|iPhone|iPod/.test(navigator.platform) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
const isDesktopSafari = userAgent?.browser?.name === 'Safari' && userAgent?.platform?.type === 'desktop';
const isIOS = userAgent?.os?.name === 'iOS';
if (isIOS || isMobileSafari || isDesktopSafari) {
document.body.classList.add('safari');
}
}
export function initRossMods() { export function initRossMods() {
// initial status check // initial status check
checkStatusDebounced(); checkStatusDebounced();
@ -741,16 +729,6 @@ export function initRossMods() {
RA_autoconnect(); RA_autoconnect();
} }
if (isMobile()) {
const fixFunkyPositioning = () => {
console.debug('[Mobile] Device viewport change detected.');
document.documentElement.style.position = 'fixed';
requestAnimationFrame(() => document.documentElement.style.position = '');
};
window.addEventListener('resize', fixFunkyPositioning);
window.addEventListener('orientationchange', fixFunkyPositioning);
}
$('#main_api').change(function () { $('#main_api').change(function () {
var PrevAPI = main_api; var PrevAPI = main_api;
setTimeout(() => RA_autoconnect(PrevAPI), 100); setTimeout(() => RA_autoconnect(PrevAPI), 100);

26
public/scripts/browser-fixes.js
View File

@ -1,3 +1,5 @@
import { getParsedUA, isMobile } from './RossAscends-mods.js';
const isFirefox = () => /firefox/i.test(navigator.userAgent); const isFirefox = () => /firefox/i.test(navigator.userAgent);
function sanitizeInlineQuotationOnCopy() { function sanitizeInlineQuotationOnCopy() {
@ -43,10 +45,34 @@ function sanitizeInlineQuotationOnCopy() {
}); });
} }
function addSafariPatch() {
const userAgent = getParsedUA();
console.debug('User Agent', userAgent);
const isMobileSafari = /iPad|iPhone|iPod/.test(navigator.platform) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
const isDesktopSafari = userAgent?.browser?.name === 'Safari' && userAgent?.platform?.type === 'desktop';
const isIOS = userAgent?.os?.name === 'iOS';
if (isIOS || isMobileSafari || isDesktopSafari) {
document.body.classList.add('safari');
}
}
function applyBrowserFixes() { function applyBrowserFixes() {
if (isFirefox()) { if (isFirefox()) {
sanitizeInlineQuotationOnCopy(); sanitizeInlineQuotationOnCopy();
} }
if (isMobile()) {
const fixFunkyPositioning = () => {
console.debug('[Mobile] Device viewport change detected.');
document.documentElement.style.position = 'fixed';
requestAnimationFrame(() => document.documentElement.style.position = '');
};
window.addEventListener('resize', fixFunkyPositioning);
window.addEventListener('orientationchange', fixFunkyPositioning);
}
addSafariPatch();
} }
export { isFirefox, applyBrowserFixes }; export { isFirefox, applyBrowserFixes };