From c40c30aaf2bc27a39caeb23ee61b9e4a6801e287 Mon Sep 17 00:00:00 2001
From: boasting-squirrel <boasting.squirrel@gmail.com>
Date: Sun, 7 Apr 2019 08:55:06 +0200
Subject: Fixed upload bug + refactored @ else in templates

---
 src/renderer.rs | 84 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

(limited to 'src/renderer.rs')

diff --git a/src/renderer.rs b/src/renderer.rs
index a0da81e..2d6fd88 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -21,11 +21,13 @@ pub fn page(
     current_dir: &str,
 ) -> Markup {
     html! {
-        (page_header(page_title, &color_scheme))
+        (page_header(page_title, &color_scheme, file_upload))
         body#drop-container {
-            div.drag-form {
-                div.drag-title {
-                    h1 { "Drop your file here to upload it" }
+            @if file_upload {
+                div.drag-form {
+                    div.drag-title {
+                        h1 { "Drop your file here to upload it" }
+                    }
                 }
             }
             (color_scheme_selector(&sort_method, &sort_order, &color_scheme))
@@ -129,7 +131,7 @@ fn color_scheme_link(
             " "
             @if color_scheme.is_dark() {
                 "(dark)"
-            } @ else {
+            } @else {
                 "(light)"
             }
         }
@@ -230,7 +232,7 @@ fn entry_row(
                                 }
                             }
                         }
-                    } @ else if entry.is_symlink() {
+                    } @else if entry.is_symlink() {
                         a.symlink href=(parametrized_link(&entry.link, &sort_method, &sort_order, &color_scheme)) {
                            (entry.name)  span.symlink-symbol { "⇢" }
                         }
@@ -652,7 +654,7 @@ fn chevron_down() -> Markup {
 }
 
 /// Partial: page header
-fn page_header(page_title: &str, color_scheme: &themes::ColorScheme) -> Markup {
+fn page_header(page_title: &str, color_scheme: &themes::ColorScheme, file_upload: bool) -> Markup {
     html! {
         (DOCTYPE)
         html {
@@ -661,43 +663,45 @@ fn page_header(page_title: &str, color_scheme: &themes::ColorScheme) -> Markup {
             meta name="viewport" content="width=device-width, initial-scale=1";
             title { (page_title) }
             style { (css(&color_scheme)) }
-            (PreEscaped(r#"
-            <script>
-                window.onload = function() {
-                    const dropContainer = document.querySelector('#drop-container');
-                    const dragForm = document.querySelector('.drag-form');
-                    const fileInput = document.querySelector('#file-input');
-                    const collection = [];
-
-                    dropContainer.ondragover = function(e) {
-                        e.preventDefault();
-                    }
+            @if file_upload {
+                (PreEscaped(r#"
+                <script>
+                    window.onload = function() {
+                        const dropContainer = document.querySelector('#drop-container');
+                        const dragForm = document.querySelector('.drag-form');
+                        const fileInput = document.querySelector('#file-input');
+                        const collection = [];
 
-                    dropContainer.ondragenter = function(e) {
-                        e.preventDefault();
-                        if (collection.length === 0) {
-                            dragForm.style.display = 'initial'; 
+                        dropContainer.ondragover = function(e) {
+                            e.preventDefault();
                         }
-                        collection.push(e.target);
-                    };
 
-                    dropContainer.ondragleave = function(e) {
-                        e.preventDefault();
-                        collection.splice(collection.indexOf(e.target), 1);
-                        if (collection.length === 0) {
-                            dragForm.style.display = 'none';
-                        }
-                    };
+                        dropContainer.ondragenter = function(e) {
+                            e.preventDefault();
+                            if (collection.length === 0) {
+                                dragForm.style.display = 'initial';
+                            }
+                            collection.push(e.target);
+                        };
 
-                    dropContainer.ondrop = function(e) {
-                        e.preventDefault();
-                        fileInput.files = e.dataTransfer.files;
-                        file_submit.submit();
-                        dragForm.style.display = 'none';
-                    };
-                }
-            </script>
-            "#))
+                        dropContainer.ondragleave = function(e) {
+                            e.preventDefault();
+                            collection.splice(collection.indexOf(e.target), 1);
+                            if (collection.length === 0) {
+                                dragForm.style.display = 'none';
+                            }
+                        };
+
+                        dropContainer.ondrop = function(e) {
+                            e.preventDefault();
+                            fileInput.files = e.dataTransfer.files;
+                            file_submit.submit();
+                            dragForm.style.display = 'none';
+                        };
+                    }
+                </script>
+                "#))
+            }
         }
     }
 }
-- 
cgit v1.2.3