Revert "Fix SrcSet & CSS issues (#148)"

This reverts commit 0315701.
titaniumnetwork-dev · Oct 27, 2024 · 6e36ac9 · 6e36ac9
1 parent 92d9075
commit 6e36ac9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 70 deletions.
diff --git a/src/rewrite/html.js b/src/rewrite/html.js
@@ -87,36 +87,24 @@ class HTML extends EventEmitter {
         return ast;
     }
     wrapSrcset(str, meta = this.ctx.meta) {
-        const regex = /(.*?)\s\d+\.?\d?[xyhw].?/g
-        const match = str.matchAll(regex);
-        var matched = false;
-
-        for (const point of match) {
-            matched = true;
-            str = str.replace(point[1], this.ctx.rewriteUrl(point[1], meta));
-        };
-
-        if (matched !== true) {
-            str = this.ctx.rewriteUrl(str, meta);  
-        };
-
-        return str;
+        return str
+            .split(',')
+            .map((src) => {
+                const parts = src.trimStart().split(' ');
+                if (parts[0]) parts[0] = this.ctx.rewriteUrl(parts[0], meta);
+                return parts.join(' ');
+            })
+            .join(', ');
     }
     unwrapSrcset(str, meta = this.ctx.meta) {
-        const regex = /(.*?)\s\d+\.?\d?[xyhw].?/g
-        const match = str.matchAll(regex);
-        var matched = false;
-
-        for (const point of match) {
-            matched = true;
-            str = str.replace(point[1], this.ctx.sourceUrl(point[1], meta));
-        };
-
-        if (matched !== true) {
-            str = this.ctx.sourceUrl(str, meta);
-        };
-
-        return str;
+        return str
+            .split(',')
+            .map((src) => {
+                const parts = src.trimStart().split(' ');
+                if (parts[0]) parts[0] = this.ctx.sourceUrl(parts[0], meta);
+                return parts.join(' ');
+            })
+            .join(', ');
     }
     static parse = parse;
     static parseFragment = parseFragment;

diff --git a/src/uv.handler.js b/src/uv.handler.js
@@ -345,9 +345,6 @@ function __uvHook(window) {
             case 'SCRIPT':
                 event.data.value = __uv.js.source(event.data.value);
                 break;
-            case 'STYLE':
-                event.data.value = __uv.sourceCSS(event.data.value);
-                break;
             default:
                 event.data.value = __uv.sourceHtml(event.data.value);
         }
@@ -680,26 +677,23 @@ function __uvHook(window) {
         },
     });
 
-    client.element.hookProperty(
-        [HTMLImageElement, HTMLSourceElement], 
-        'srcset', 
-        {
-            get: (target, that) => {
-                return (
-                        client.element.getAttribute.call(
-                        that,
-                        __uv.attributePrefix + '-attr-srcset'
-                     ) || target.call(that)
-                );
-            },
-            set: (target, that, [val]) => {
-                client.element.setAttribute.call(
+    client.element.hookProperty([HTMLImageElement], 'srcset', {
+        get: (target, that) => {
+            return (
+                client.element.getAttribute.call(
                     that,
-                    __uv.attributePrefix + '-attr-srcset',
-                    val
-                );
-                target.call(that, __uv.html.wrapSrcset(val.toString()));
-            },
+                    __uv.attributePrefix + '-attr-srcset'
+                ) || target.call(that)
+            );
+        },
+        set: (target, that, [val]) => {
+            client.element.setAttribute.call(
+                that,
+                __uv.attributePrefix + '-attr-srcset',
+                val
+            );
+            target.call(that, __uv.html.wrapSrcset(val.toString()));
+        },
     });
 
     client.element.hookProperty(HTMLScriptElement, 'integrity', {
@@ -798,30 +792,14 @@ function __uvHook(window) {
     });
 
     client.node.on('getTextContent', (event) => {
-       switch (event.that.tagName) {
-            case 'SCRIPT':
-                event.data.value = __uv.js.source(event.data.value);
-                break;
-            case 'STYLE':
-                event.data.value = __uv.sourceCSS(event.data.value);
-                break;
-            default:
-               // Interferes with HTML Character Entities.
-               // event.data.value = __uv.sourceHtml(event.data.value);
+        if (event.that.tagName === 'SCRIPT') {
+            event.data.value = __uv.js.source(event.data.value);
         }
     });
 
     client.node.on('setTextContent', (event) => {
-        switch (event.that.tagName) {
-            case 'SCRIPT':
-                event.data.value = __uv.js.rewrite(event.data.value);
-                break;
-            case 'STYLE':
-                event.data.value = __uv.rewriteCSS(event.data.value);
-                break;
-            default:
-               // Interferes with HTML Character Entities.
-               //  event.data.value = __uv.rewriteHtml(event.data.value);
+        if (event.that.tagName === 'SCRIPT') {
+            event.data.value = __uv.js.rewrite(event.data.value);
         }
     });