Run Safari patch before loading settings

48c2646dfad065dd99a8548249fd7f82d320558f

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 5d21eebe75d766a2e825023fee2d0d6420914e55
2 files changed, +15 -12Showing whitespace changes
public/script.js+3 -2
@@ -1,4 +1,4 @@
1import { humanizedDateTime, favsToHotswap, getMessageTimeStamp, dragElement, isMobile, initRossMods, shouldSendOnEnter } from './scripts/RossAscends-mods.js';1import { humanizedDateTime, favsToHotswap, getMessageTimeStamp, dragElement, isMobile, initRossMods, shouldSendOnEnter, addSafariPatch } from './scripts/RossAscends-mods.js';
2import { userStatsHandler, statMesProcess, initStats } from './scripts/stats.js';2import { userStatsHandler, statMesProcess, initStats } from './scripts/stats.js';
3import {3import {
4 generateKoboldWithStreaming,4 generateKoboldWithStreaming,
@@ -916,6 +916,7 @@ async function firstLoadInit() {
916 throw new Error('Initialization failed');916 throw new Error('Initialization failed');
917 }917 }
918918
919 addSafariPatch();
919 await getClientVersion();920 await getClientVersion();
920 await readSecretState();921 await readSecretState();
921 initLocales();922 initLocales();
@@ -6322,7 +6323,7 @@ export function setUserName(value) {
63226323
6323async function doOnboarding(avatarId) {6324async function doOnboarding(avatarId) {
6324 const template = $('#onboarding_template .onboarding');6325 const template = $('#onboarding_template .onboarding');
6325 let userName = await callGenericPopup(template, POPUP_TYPE.INPUT, currentUser?.name || name1, { rows: 2, wide: true, large: true });6326 let userName = await callGenericPopup(template, POPUP_TYPE.INPUT, currentUser?.name || name1, { rows: 2, wider: true, cancelButton: false });
63266327
6327 if (userName) {6328 if (userName) {
6328 userName = String(userName).replace('\n', ' ');6329 userName = String(userName).replace('\n', ' ');
public/scripts/RossAscends-mods.js+12 -10
@@ -711,6 +711,18 @@ export const autoFitSendTextAreaDebounced = debounce(autoFitSendTextArea, deboun
711711
712// ---------------------------------------------------712// ---------------------------------------------------
713713
714export function addSafariPatch() {
715 const userAgent = getParsedUA();
716 console.debug('User Agent', userAgent);
717 const isMobileSafari = /iPad|iPhone|iPod/.test(navigator.platform) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
718 const isDesktopSafari = userAgent?.browser?.name === 'Safari' && userAgent?.platform?.type === 'desktop';
719 const isIOS = userAgent?.os?.name === 'iOS';
720
721 if (isIOS || isMobileSafari || isDesktopSafari) {
722 document.body.classList.add('safari');
723 }
724}
725
714export function initRossMods() {726export function initRossMods() {
715 // initial status check727 // initial status check
716 setTimeout(() => {728 setTimeout(() => {
@@ -725,16 +737,6 @@ export function initRossMods() {
725 RA_autoconnect();737 RA_autoconnect();
726 }738 }
727739
728 const userAgent = getParsedUA();
729 console.debug('User Agent', userAgent);
730 const isMobileSafari = /iPad|iPhone|iPod/.test(navigator.platform) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
731 const isDesktopSafari = userAgent?.browser?.name === 'Safari' && userAgent?.platform?.type === 'desktop';
732 const isIOS = userAgent?.os?.name === 'iOS';
733
734 if (isIOS || isMobileSafari || isDesktopSafari) {
735 document.body.classList.add('safari');
736 }
737
738 $('#main_api').change(function () {740 $('#main_api').change(function () {
739 var PrevAPI = main_api;741 var PrevAPI = main_api;
740 setTimeout(() => RA_autoconnect(PrevAPI), 100);742 setTimeout(() => RA_autoconnect(PrevAPI), 100);