moved javascript to own file instead in html. Javascript code is messy.

viktorholk · Oct 12, 2020 · 0ec34c6 · 0ec34c6
1 parent be59b89
commit 0ec34c6
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 119 deletions.
diff --git a/pcs/static/main.js b/pcs/static/main.js
@@ -0,0 +1,116 @@
+
+        function changefolder(i) {
+            y = document.getElementById('change_folder')
+            y.value = i
+            y.click()
+        }
+
+        function folderpopup(){
+            i = document.getElementById('popupfolder');
+            y = document.getElementById('popupfile');
+            yy = document.getElementById('popupfolders');
+            if (getComputedStyle(y, null).display == 'none' || getComputedStyle(yy, null).display == 'none'){
+                display = getComputedStyle(i, null).display;
+                if (display == 'none'){
+                    i.style.display = 'block';
+                } else {
+                    i.style.display = 'none';
+                }
+            }else{
+                i.style.display = 'block';
+                y.style.display = 'none';
+                yy.style.display = 'none';
+            }
+        }
+        // Get the input field
+        var input = document.getElementById("newfoldername");
+
+        // Execute a function when the user releases a key on the keyboard
+        input.addEventListener("keyup", function(event) {
+        // Number 13 is the "Enter" key on the keyboard
+        if (event.keyCode === 13) {
+            // Cancel the default action, if needed
+            event.preventDefault();
+            // Trigger the button element with a click
+            document.getElementById("submitfolder").click();
+        }
+        });
+
+        function filepopup(){
+            i = document.getElementById('popupfile');
+            ii = document.getElementById('popupfolders');
+            y = document.getElementById('popupfolder');
+            if (getComputedStyle(y, null).display == 'none'){
+                display = getComputedStyle(i, null).display;
+                if (display == 'none'){
+                    i.style.display = 'block';
+                    ii.style.display = 'block';
+                } else {
+                    i.style.display = 'none';
+                    ii.style.display = 'none';
+                }
+            } else{
+                i.style.display = 'block';
+                ii.style.display = 'block';
+                y.style.display = 'none';
+            }
+        }
+        function fileuploaded(){
+            document.getElementById('submitfile').click()
+        }
+        function foldersuploaded(){
+            document.getElementById('submitfolders').click()
+        }
+
+        function deleteItem(i){
+            let y = document.getElementById('delete_button')
+            console.log(y)
+            y.value = i;
+            let x = confirm('Delete ' + i + " ?")
+            if (x == true){
+                y.click()
+            }
+        }
+        function editItem(i){
+            let y = document.getElementById('edit_button')
+            console.log(y)
+            let x = prompt('Assign a new name for ' + i)
+
+            if (!x == null || !x == ''){
+                y.value = String(i + "," + x)
+                y.click();
+            }
+        }
+        function download_folder(i){
+            let y = document.getElementById('zip_folder');
+            console.log(y);
+            y.value = i;
+            y.click();
+            console.log(y.value);
+        }
+
+
+        function deleteItem(i){
+            let y = document.getElementById('delete_button')
+            console.log(y)
+            y.value = i;
+            let x = confirm('Delete ' + i + " ?")
+            if (x == true){
+                y.click()
+            }
+        }
+
+        function editItem(i){
+            let y = document.getElementById('edit_button')
+            console.log(y)
+            let x = prompt('Assign a new name for ' + i)
+
+            if (!x == null || !x == ''){
+                y.value = String(i + "," + x)
+                y.click();
+            }
+        }
+
+        function fileuploaded(){
+            document.getElementById('submitfile').click()
+        }
diff --git a/pcs/templates/base.html b/pcs/templates/base.html
@@ -17,7 +17,9 @@
 
     <link href="https://fonts.googleapis.com/css?family=Raleway:400,700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,700&display=swap" rel="stylesheet">
-<link href="https://fonts.googleapis.com/css?family=Caveat&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Caveat&display=swap" rel="stylesheet">
+
+  <script src="../static/main.js"></script>
 
 </head>
 <body id="backgrounder">

diff --git a/pcs/templates/main/cloud.html b/pcs/templates/main/cloud.html
@@ -160,97 +160,5 @@ <h6  style="font-weight: bold;">{{ user_cloud.get_storage() }} / {{ user_cloud.g
                 </form>
             </div>
     </div>
-    <script>
 
-        function changefolder(i) {
-            y = document.getElementById('change_folder')
-            y.value = i
-            y.click()
-        }
-
-        function folderpopup(){
-            i = document.getElementById('popupfolder');
-            y = document.getElementById('popupfile');
-            yy = document.getElementById('popupfolders');
-            if (getComputedStyle(y, null).display == 'none' || getComputedStyle(yy, null).display == 'none'){
-                display = getComputedStyle(i, null).display;
-                if (display == 'none'){
-                    i.style.display = 'block';
-                } else {
-                    i.style.display = 'none';
-                }
-            }else{
-                i.style.display = 'block';
-                y.style.display = 'none';
-                yy.style.display = 'none';
-            }
-        }
-        // Get the input field
-        var input = document.getElementById("newfoldername");
-
-        // Execute a function when the user releases a key on the keyboard
-        input.addEventListener("keyup", function(event) {
-        // Number 13 is the "Enter" key on the keyboard
-        if (event.keyCode === 13) {
-            // Cancel the default action, if needed
-            event.preventDefault();
-            // Trigger the button element with a click
-            document.getElementById("submitfolder").click();
-        }
-        });
-
-        function filepopup(){
-            i = document.getElementById('popupfile');
-            ii = document.getElementById('popupfolders');
-            y = document.getElementById('popupfolder');
-            if (getComputedStyle(y, null).display == 'none'){
-                display = getComputedStyle(i, null).display;
-                if (display == 'none'){
-                    i.style.display = 'block';
-                    ii.style.display = 'block';
-                } else {
-                    i.style.display = 'none';
-                    ii.style.display = 'none';
-                }
-            } else{
-                i.style.display = 'block';
-                ii.style.display = 'block';
-                y.style.display = 'none';
-            }
-        }
-        function fileuploaded(){
-            document.getElementById('submitfile').click()
-        }
-        function foldersuploaded(){
-            document.getElementById('submitfolders').click()
-        }
-
-        function deleteItem(i){
-            let y = document.getElementById('delete_button')
-            console.log(y)
-            y.value = i;
-            let x = confirm('Delete ' + i + " ?")
-            if (x == true){
-                y.click()
-            }
-        }
-        function editItem(i){
-            let y = document.getElementById('edit_button')
-            console.log(y)
-            let x = prompt('Assign a new name for ' + i)
-
-            if (!x == null || !x == ''){
-                y.value = String(i + "," + x)
-                y.click();
-            }
-        }
-        function download_folder(i){
-            let y = document.getElementById('zip_folder');
-            console.log(y);
-            y.value = i;
-            y.click();
-            console.log(y.value);
-        }
-
-    </script>
 {% endblock %}
diff --git a/pcs/templates/main/uploads.html b/pcs/templates/main/uploads.html
@@ -72,30 +72,4 @@ <h6  style="font-weight: bold;">{{ obj.count_files() }} Files</h6>
 
     </div>
 
-    <script>
-        function deleteItem(i){
-            let y = document.getElementById('delete_button')
-            console.log(y)
-            y.value = i;
-            let x = confirm('Delete ' + i + " ?")
-            if (x == true){
-                y.click()
-            }
-        }
-
-        function editItem(i){
-            let y = document.getElementById('edit_button')
-            console.log(y)
-            let x = prompt('Assign a new name for ' + i)
-
-            if (!x == null || !x == ''){
-                y.value = String(i + "," + x)
-                y.click();
-            }
-        }
-
-        function fileuploaded(){
-            document.getElementById('submitfile').click()
-        }
-    </script>
 {% endblock %}