From 67e0a2de4467fdf47748edf42df66de3594f4441 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:56:02 +0800
Subject: [PATCH] Combine script tags

---
 src/webui/www/private/download.html      |  3 +-
 src/webui/www/private/downloadlimit.html | 68 ++++++++++++------------
 src/webui/www/private/upload.html        |  3 +-
 src/webui/www/private/uploadlimit.html   | 68 ++++++++++++------------
 4 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
index 13caf8526..6d556fddb 100644
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@@ -160,6 +160,8 @@
             </fieldset>
         </div>
     </form>
+    <div id="download_spinner" class="mochaSpinner"></div>
+
     <script>
         'use strict';
 
@@ -190,7 +192,6 @@
                 window.parent.qBittorrent.Client.closeWindows();
         });
     </script>
-    <div id="download_spinner" class="mochaSpinner"></div>
 </body>
 
 </html>
diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html
index 35e127363..30ca841bf 100644
--- a/src/webui/www/private/downloadlimit.html
+++ b/src/webui/www/private/downloadlimit.html
@@ -21,44 +21,43 @@
             </div>
             <div class="clear"></div>
         </div>
-        <script>
-            'use strict';
-
-            const hashes = new URI().getData('hashes').split('|');
-            const setDlLimit = function() {
-                const limit = $("dllimitUpdatevalue").value.toInt() * 1024;
-                if (hashes[0] == "global") {
-                    new Request({
-                        url: 'api/v2/transfer/setDownloadLimit',
-                        method: 'post',
-                        data: {
-                            'limit': limit
-                        },
-                        onComplete: function() {
-                            window.parent.updateMainData();
-                            window.parent.qBittorrent.Client.closeWindows();
-                        }
-                    }).send();
-                }
-                else {
-                    new Request({
-                        url: 'api/v2/torrents/setDownloadLimit',
-                        method: 'post',
-                        data: {
-                            'hashes': hashes.join('|'),
-                            'limit': limit
-                        },
-                        onComplete: function() {
-                            window.parent.qBittorrent.Client.closeWindows();
-                        }
-                    }).send();
-                }
-            };
-        </script>
         <input type="button" id="applyButton" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setDlLimit()" />
     </div>
 
     <script>
+        'use strict';
+
+        const hashes = new URI().getData('hashes').split('|');
+        const setDlLimit = function() {
+            const limit = $("dllimitUpdatevalue").value.toInt() * 1024;
+            if (hashes[0] == "global") {
+                new Request({
+                    url: 'api/v2/transfer/setDownloadLimit',
+                    method: 'post',
+                    data: {
+                        'limit': limit
+                    },
+                    onComplete: function() {
+                        window.parent.updateMainData();
+                        window.parent.qBittorrent.Client.closeWindows();
+                    }
+                }).send();
+            }
+            else {
+                new Request({
+                    url: 'api/v2/torrents/setDownloadLimit',
+                    method: 'post',
+                    data: {
+                        'hashes': hashes.join('|'),
+                        'limit': limit
+                    },
+                    onComplete: function() {
+                        window.parent.qBittorrent.Client.closeWindows();
+                    }
+                }).send();
+            }
+        };
+
         new Keyboard({
             defaultEventType: 'keydown',
             events: {
@@ -81,7 +80,6 @@
 
         MochaUI.addDlLimitSlider(hashes);
     </script>
-
 </body>
 
 </html>
diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html
index e8fb925c7..d8f5754ef 100644
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@@ -147,6 +147,8 @@
             </div>
         </fieldset>
     </form>
+    <div id="upload_spinner" class="mochaSpinner"></div>
+
     <script>
         'use strict';
 
@@ -171,7 +173,6 @@
             $('fileselect').accept = ".torrent";
         }
     </script>
-    <div id="upload_spinner" class="mochaSpinner"></div>
 </body>
 
 </html>
diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html
index b0dc4d800..df9d3772d 100644
--- a/src/webui/www/private/uploadlimit.html
+++ b/src/webui/www/private/uploadlimit.html
@@ -21,44 +21,43 @@
             </div>
             <div class="clear"></div>
         </div>
-        <script>
-            'use strict';
-
-            const hashes = new URI().getData('hashes').split('|');
-            const setUpLimit = function() {
-                const limit = $("uplimitUpdatevalue").value.toInt() * 1024;
-                if (hashes[0] == "global") {
-                    new Request({
-                        url: 'api/v2/transfer/setUploadLimit',
-                        method: 'post',
-                        data: {
-                            'limit': limit
-                        },
-                        onComplete: function() {
-                            window.parent.updateMainData();
-                            window.parent.qBittorrent.Client.closeWindows();
-                        }
-                    }).send();
-                }
-                else {
-                    new Request({
-                        url: 'api/v2/torrents/setUploadLimit',
-                        method: 'post',
-                        data: {
-                            'hashes': hashes.join('|'),
-                            'limit': limit
-                        },
-                        onComplete: function() {
-                            window.parent.qBittorrent.Client.closeWindows();
-                        }
-                    }).send();
-                }
-            };
-        </script>
         <input type="button" id="applyButton" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setUpLimit()" />
     </div>
 
     <script>
+        'use strict';
+
+        const hashes = new URI().getData('hashes').split('|');
+        const setUpLimit = function() {
+            const limit = $("uplimitUpdatevalue").value.toInt() * 1024;
+            if (hashes[0] == "global") {
+                new Request({
+                    url: 'api/v2/transfer/setUploadLimit',
+                    method: 'post',
+                    data: {
+                        'limit': limit
+                    },
+                    onComplete: function() {
+                        window.parent.updateMainData();
+                        window.parent.qBittorrent.Client.closeWindows();
+                    }
+                }).send();
+            }
+            else {
+                new Request({
+                    url: 'api/v2/torrents/setUploadLimit',
+                    method: 'post',
+                    data: {
+                        'hashes': hashes.join('|'),
+                        'limit': limit
+                    },
+                    onComplete: function() {
+                        window.parent.qBittorrent.Client.closeWindows();
+                    }
+                }).send();
+            }
+        };
+
         new Keyboard({
             defaultEventType: 'keydown',
             events: {
@@ -81,7 +80,6 @@
 
         MochaUI.addUpLimitSlider(hashes);
     </script>
-
 </body>
 
 </html>