From 5982b1d337d0bbdedec675279c3f264a30f7ab26 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <YiFang.xiao@foxmail.com>
Date: Wed, 4 Dec 2024 12:03:06 +0800
Subject: [PATCH 1/2] Revert "fix: <script> without src is not delayed like
 <script src="..." defer>"

This reverts commit 00dbc74bb78a199227a5dfa0a89252f9f85ea2a5.
---
 src/dict/mdx.cc           | 6 ++----
 src/scripts/gd-builtin.js | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
index a48338e2..49a15bb1 100644
--- a/src/dict/mdx.cc
+++ b/src/dict/mdx.cc
@@ -877,8 +877,7 @@ QString & MdxDictionary::filterResource( QString & article )
 void MdxDictionary::replaceLinks( QString & id, QString & article )
 {
   QString articleNewText;
-  qsizetype linkPos = 0;
-
+  int linkPos                        = 0;
   QRegularExpressionMatchIterator it = RX::Mdx::allLinksRe.globalMatch( article );
   while ( it.hasNext() ) {
     QRegularExpressionMatch allLinksMatch = it.next();
@@ -954,8 +953,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
         articleNewText += linkTxt;
         match = RX::Mdx::closeScriptTagRe.match( article, linkPos );
         if ( match.hasMatch() ) {
-          articleNewText += QString( QStringLiteral( "gdOnReady(()=>{%1});</script>" ) )
-                              .arg( article.mid( linkPos, match.capturedStart() - linkPos ) );
+          articleNewText += article.mid( linkPos, match.capturedEnd() - linkPos );
           linkPos = match.capturedEnd();
         }
         continue;
diff --git a/src/scripts/gd-builtin.js b/src/scripts/gd-builtin.js
index 45c5971a..d9421c0f 100644
--- a/src/scripts/gd-builtin.js
+++ b/src/scripts/gd-builtin.js
@@ -1,11 +1,3 @@
-function gdOnReady(func) {
-  if (document.readyState !== "loading") {
-    func();
-  } else {
-    document.addEventListener("DOMContentLoaded", func);
-  }
-}
-
 function gdMakeArticleActive(newId, noEvent) {
   const gdCurrentArticle =
     document.querySelector(".gdactivearticle").attributes.id;

From 612dc8db0fff6871d95c2ff113dd344667c5dd20 Mon Sep 17 00:00:00 2001
From: YiFang Xiao <YiFang.xiao@foxmail.com>
Date: Wed, 4 Dec 2024 12:04:21 +0800
Subject: [PATCH 2/2] Revert "opt: [mdx]js script with defer attribute (#1869)"

This reverts commit 939e78633165c1cb1908ece5448139d8bea49b41.
---
 src/dict/mdx.cc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
index 49a15bb1..35c769f3 100644
--- a/src/dict/mdx.cc
+++ b/src/dict/mdx.cc
@@ -959,7 +959,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
         continue;
       }
       else {
-        //audio ,script,video ,html5 tags fall here.
+        //audio ,video ,html5 tags fall here.
         match = RX::Mdx::srcRe.match( linkTxt );
         if ( match.hasMatch() ) {
           QString newText;
@@ -971,15 +971,9 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
           else {
             scheme = "bres://";
           }
-
           newText =
             match.captured( 1 ) + match.captured( 2 ) + scheme + id + "/" + match.captured( 3 ) + match.captured( 2 );
 
-          //add defer to script tag
-          if ( linkType.compare( "script" ) == 0 ) {
-            newText = newText + " defer ";
-          }
-
           newLink = linkTxt.replace( match.capturedStart(), match.capturedLength(), newText );
         }
         else {