Merge pull request #8672 from Chocobo1/js

Move JavaScript libraries to its own folder

src/webui/webui.qrc

@@ -1,49 +1,48 @@
 <RCC>
     <qresource prefix="/">
+        <file>www/private/about.html</file>
+        <file>www/private/addtrackers.html</file>
+        <file>www/private/confirmdeletion.html</file>
         <file>www/private/css/Core.css</file>
         <file>www/private/css/dynamicTable.css</file>
         <file>www/private/css/Layout.css</file>
         <file>www/private/css/style.css</file>
         <file>www/private/css/Tabs.css</file>
         <file>www/private/css/Window.css</file>
+        <file>www/private/download.html</file>
+        <file>www/private/downloadlimit.html</file>
+        <file>www/private/filters.html</file>
+        <file>www/private/index.html</file>
+        <file>www/private/newcategory.html</file>
+        <file>www/private/preferences.html</file>
+        <file>www/private/preferences_content.html</file>
+        <file>www/private/properties.html</file>
+        <file>www/private/properties_content.html</file>
+        <file>www/private/rename.html</file>
         <file>www/private/scripts/client.js</file>
-        <file>www/private/scripts/clipboard.min.js</file>
         <file>www/private/scripts/contextmenu.js</file>
         <file>www/private/scripts/download.js</file>
         <file>www/private/scripts/dynamicTable.js</file>
-        <file>www/private/scripts/excanvas-compressed.js</file>
+        <file>www/private/scripts/lib/clipboard.min.js</file>
+        <file>www/private/scripts/lib/excanvas-compressed.js</file>
+        <file>www/private/scripts/lib/mocha-yc.js</file>
+        <file>www/private/scripts/lib/mootools-1.2-core-yc.js</file>
+        <file>www/private/scripts/lib/mootools-1.2-more.js</file>
+        <file>www/private/scripts/lib/parametrics.js</file>
         <file>www/private/scripts/misc.js</file>
-        <file>www/private/scripts/mocha.js</file>
         <file>www/private/scripts/mocha-init.js</file>
-        <file>www/private/scripts/mocha-yc.js</file>
-        <file>www/private/scripts/mootools-1.2-core-yc.js</file>
-        <file>www/private/scripts/mootools-1.2-more.js</file>
-        <file>www/private/scripts/parametrics.js</file>
         <file>www/private/scripts/progressbar.js</file>
         <file>www/private/scripts/prop-files.js</file>
         <file>www/private/scripts/prop-general.js</file>
         <file>www/private/scripts/prop-trackers.js</file>
         <file>www/private/scripts/prop-webseeds.js</file>
-        <file>www/private/about.html</file>
-        <file>www/private/addtrackers.html</file>
-        <file>www/private/confirmdeletion.html</file>
-        <file>www/private/download.html</file>
-        <file>www/private/downloadlimit.html</file>
-        <file>www/private/filters.html</file>
-        <file>www/private/index.html</file>
-        <file>www/private/newcategory.html</file>
-        <file>www/private/preferences.html</file>
-        <file>www/private/preferences_content.html</file>
-        <file>www/private/properties.html</file>
-        <file>www/private/properties_content.html</file>
-        <file>www/private/rename.html</file>
         <file>www/private/setlocation.html</file>
         <file>www/private/statistics.html</file>
         <file>www/private/transferlist.html</file>
         <file>www/private/upload.html</file>
         <file>www/private/uploadlimit.html</file>
         <file>www/public/css/style.css</file>
-        <file>www/public/scripts/mootools-1.2-core-yc.js</file>
         <file>www/public/login.html</file>
+        <file>www/public/scripts/lib/mootools-1.2-core-yc.js</file>
     </qresource>
 </RCC>

src/webui/www/private/addtrackers.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Trackers addition dialog)QBT_TR[CONTEXT=TrackersAdditionDlg]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         window.addEvent('domready', function(){
             $('trackersUrls').focus();

src/webui/www/private/confirmdeletion.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Deletion confirmation - qBittorrent)QBT_TR[CONTEXT=confirmDeletionDlg]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         var hashes = new URI().getData('hashes').split('|');
         window.addEvent('domready', function(){

src/webui/www/private/download.html

@@ -5,7 +5,7 @@
     <title>QBT_TR(Add Torrent Links)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Window.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/download.js"></script>
 </head>
 <body>

src/webui/www/private/downloadlimit.html

@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Torrent Download Speed Limiting)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
-    <script src="scripts/parametrics.js"></script>
+    <script src="scripts/lib/parametrics.js"></script>
 </head>
 <body>
 <div style="width: 100%; text-align: center; margin: 0 auto; overflow: hidden">

src/webui/www/private/index.html

@@ -12,14 +12,14 @@
     <link rel="stylesheet" type="text/css" href="css/Layout.css" />
     <link rel="stylesheet" type="text/css" href="css/Window.css" />
     <link rel="stylesheet" type="text/css" href="css/Tabs.css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <!--[if IE]>
-        <script src="scripts/excanvas-compressed.js"></script>
+        <script src="scripts/lib/excanvas-compressed.js"></script>
     <![endif]-->
-    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
     <script src="scripts/mocha-init.js"></script>
-    <script src="scripts/clipboard.min.js"></script>
+    <script src="scripts/lib/clipboard.min.js"></script>
     <script src="scripts/misc.js"></script>
     <script src="scripts/progressbar.js"></script>
     <script src="scripts/dynamicTable.js"></script>

src/webui/www/private/newcategory.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(New Category)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         var newCategoryKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',

src/webui/www/private/preferences.html

@@ -5,9 +5,9 @@
     <title>QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Tabs.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
 </head>
 <body style="padding: 5px;">
 <!-- preferences -->

src/webui/www/private/rename.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Rename)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script src="scripts/misc.js"></script>
     <script>
         var renameKeyboardEvents = new Keyboard({

src/webui/www/private/scripts/client.js

@@ -639,7 +639,7 @@ function setupCopyEventHandler() {
     if (clipboardEvent)
         clipboardEvent.destroy();
 
-    clipboardEvent = new Clipboard('.copyToClipboard', {
+    clipboardEvent = new ClipboardJS('.copyToClipboard', {
         text: function(trigger) {
             var textToCopy;
 

src/webui/www/private/setlocation.html

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Set location)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
     <script>
         var setLocationKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',

src/webui/www/private/upload.html

@@ -5,7 +5,7 @@
     <title>QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <link rel="stylesheet" href="css/Window.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/download.js"></script>
 </head>
 <body>

src/webui/www/private/uploadlimit.html

@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <title>QBT_TR(Torrent Upload Speed Limiting)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="scripts/mootools-1.2-core-yc.js"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
-    <script src="scripts/mootools-1.2-more.js"></script>
+    <script src="scripts/lib/mootools-1.2-more.js"></script>
-    <script src="scripts/mocha-yc.js"></script>
+    <script src="scripts/lib/mocha-yc.js"></script>
-    <script src="scripts/parametrics.js"></script>
+    <script src="scripts/lib/parametrics.js"></script>
 </head>
 <body>
 <div style="width: 100%; text-align: center; margin: 0 auto; overflow: hidden">

src/webui/www/public/login.html

@@ -5,7 +5,7 @@
     <title>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
     <link rel="icon" type="image/png" href="images/skin/qbittorrent16.png" />
     <link rel="stylesheet" type="text/css" href="css/style.css" />
-    <script src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
+    <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script>
       window.onload = function() {
         $('username').focus();