Merge pull request #2994 from artisticMink/fix-double-quotes Fix double double quotes when copying chat message text in Firefox

ada44497dea61f47c29c5236879e42ce5127028a

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

Signed

Parents: cbcb0bb0ad52fffed0a4d6f50e740f6b734d7e4f 82570ef31d86bce75d925a9c0d84f4781f1ec627

public/script.js+3 -2 Viewed

-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 {
     generateKoboldWithStreaming,

 import { initSystemPrompts } from './scripts/sysprompt.js';
 import { registerExtensionSlashCommands as initExtensionSlashCommands } from './scripts/extensions-slashcommands.js';
 import { ToolManager } from './scripts/tool-calling.js';
+import { applyBrowserFixes } from './scripts/browser-fixes.js';
 //exporting functions and vars for mods
 export {

         throw new Error('Initialization failed');
+    }
-    addSafariPatch();
+    applyBrowserFixes();
     await getClientVersion();
     await readSecretState();
     await initLocales();

public/scripts/RossAscends-mods.js+1 -23 Viewed

  */
 var parsedUA = null;
-function getParsedUA() {
+export function getParsedUA() {
     if (!parsedUA) {
         try {
             parsedUA = Bowser.parse(navigator.userAgent);

 // ---------------------------------------------------
-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() {
     // initial status check
     checkStatusDebounced();

         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 () {
         var PrevAPI = main_api;
         setTimeout(() => RA_autoconnect(PrevAPI), 100);

public/scripts/browser-fixes.js+77 -0 Viewed

+import { getParsedUA, isMobile } from './RossAscends-mods.js';
+const isFirefox = () => /firefox/i.test(navigator.userAgent);
+function sanitizeInlineQuotationOnCopy() {
+    // STRG+C, STRG+V on firefox leads to duplicate double quotes when inline quotation elements are copied.
+    // To work around this, take the selection and transform <q> to <span> before calling toString().
+    document.addEventListener('copy', function (event) {
+        const selection = window.getSelection();
+        if (!selection.anchorNode?.parentElement.closest('.mes_text')) {
+            return;
+        }
+        const range = selection.getRangeAt(0).cloneContents();
+        const tempDOM = document.createDocumentFragment();
+        function processNode(node) {
+            if (node.nodeType === Node.ELEMENT_NODE && node.tagName.toLowerCase() === 'q') {
+                // Transform <q> to <span>, preserve children
+                const span = document.createElement('span');
+                [...node.childNodes].forEach(child => {
+                    const processedChild = processNode(child);
+                    span.appendChild(processedChild);
+                });
+                return span;
+            } else {
+                // Nested structures containing <q> elements are unlikely
+                return node.cloneNode(true);
+            }
+        }
+        [...range.childNodes].forEach(child => {
+            const processedChild = processNode(child);
+            tempDOM.appendChild(processedChild);
+        });
+        const newRange = document.createRange();
+        newRange.selectNodeContents(tempDOM);
+        event.preventDefault();
+        event.clipboardData.setData('text/plain', newRange.toString());
+    });
+}
+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() {
+    if (isFirefox()) {
+        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 };