update popups and delete verification

Gruntfile.js

@@ -22,6 +22,7 @@ module.exports = function(grunt) {
           'node_modules/font-awesome/css/font-awesome.css',
           'node_modules/animate.css/source/_base.css',
           'node_modules/animate.css/source/bouncing_entrances/bounceInRight.css',
+          'node_modules/animate.css/source/fading_entrances/fadeIn.css',
           'node_modules/animate.css/source/fading_exits/fadeOut.css',
           'assets/src/css/main.css'
         ],

assets/src/css/main.css

@@ -223,6 +223,14 @@ input[type="submit"] {
   transition: .5s ease background-color;
 }
 
+button.darker {
+  background-color: #F9A825;
+}
+
+button.darker:hover {
+  background-color: #F57F17;
+}
+
 button:hover,
 input[type="submit"]:hover,
 button:active,
@@ -472,7 +480,7 @@ fieldset input {
 
 /* POPUS */
 
-.foreground {
+#foreground {
   z-index: 99999;
   position: fixed;
   top: 0;

assets/src/js/browse.js

@@ -1,5 +1,50 @@
 $(document).on('page:browse', function() {
-  var foreground = $('.foreground');
+  var foreground = $('#foreground');
+
+  /* DELETE FILE */
+
+  var remove = new Object();
+  remove.form = $('form#delete');
+  remove.row = '';
+  remove.button = '';
+  remove.url = '';
+
+  $('body').off('click', '.delete').on('click', '.delete', function(event) {
+    event.preventDefault();
+    remove.button = $(this);
+    remove.row = $(this).parent().parent();
+    foreground.fadeIn(200);
+    remove.url = remove.row.find('.filename').text();
+    remove.form.fadeIn(200);
+    remove.form.find('span').text(rename.url);
+    return false;
+  });
+
+  remove.form.off('submit').submit(function(event) {
+    event.preventDefault();
+
+    $.ajax({
+      type: 'DELETE',
+      url: remove.button.data("file")
+    }).done(function(data) {
+      foreground.fadeOut(200);
+      remove.form.fadeOut(200);
+      remove.row.fadeOut(200);
+      notification({
+        text: remove.button.data("message"),
+        type: 'success',
+        timeout: 5000
+      });
+    }).fail(function(data) {
+      notification({
+        text: 'Something went wrong.',
+        type: 'error'
+      });
+      console.log(data);
+    });
+
+    return false;
+  });
 
   /* FILE UPLOAD */
 
@@ -58,20 +103,11 @@ $(document).on('page:browse', function() {
   create.button = '';
   create.url = '';
 
-  $('.new').off('click').click(function(event) {
+  $('body').off('click', '.new').on('click', '.new', function(event) {
     event.preventDefault();
     create.button = $(this);
-
+    foreground.fadeIn(200);
-    if ($(this).data("opened")) {
+    create.form.fadeIn(200);
-      foreground.fadeOut(200);
-      create.form.fadeOut(200);
-      create.button.data("opened", false);
-    } else {
-      foreground.fadeIn(200);
-      create.form.fadeIn(200);
-      create.button.data("opened", true);
-    }
-
     return false;
   });
 
@@ -150,22 +186,15 @@ $(document).on('page:browse', function() {
   rename.button = '';
   rename.url = '';
 
-  $('.rename').off('click').click(function(event) {
+  $('body').off('click', '.rename').on('click', '.rename', function(event) {
     event.preventDefault();
     rename.button = $(this);
 
-    if ($(this).data("opened")) {
+    foreground.fadeIn(200);
-      foreground.fadeOut(200);
+    rename.url = $(this).parent().parent().find('.filename').text();
-      rename.form.fadeOut(200);
+    rename.form.fadeIn(200);
-      rename.button.data("opened", false);
+    rename.form.find('span').text(rename.url);
-    } else {
+    rename.form.find('input[type="text"]').val(rename.url);
-      foreground.fadeIn(200);
-      rename.url = $(this).parent().parent().find('.filename').text();
-      rename.form.fadeIn(200);
-      rename.form.find('span').text(rename.url);
-      rename.form.find('input[type="text"]').val(rename.url);
-      rename.button.data("opened", true);
-    }
 
     return false;
   });
@@ -219,38 +248,19 @@ $(document).on('page:browse', function() {
     return false;
   });
 
-  $('body').off('click', '.delete').on('click', '.delete', function(event) {
+  /* FOREGROUND AND STUFF */
+
+  $('body').off('click', '.close').on('click', '.close', function(event) {
     event.preventDefault();
-    button = $(this);
+    $(this).parent().parent().fadeOut(200);
-
+    foreground.click();
-    $.ajax({
-      type: 'DELETE',
-      url: button.data("file")
-    }).done(function(data) {
-      button.parent().parent().fadeOut();
-      notification({
-        text: button.data("message"),
-        type: 'success',
-        timeout: 5000
-      });
-    }).fail(function(data) {
-      notification({
-        text: 'Something went wrong.',
-        type: 'error'
-      });
-      console.log(data);
-    });
-
     return false;
   });
 
-  /* FOREGROUND */
-
   foreground.off('click').click(function() {
     foreground.fadeOut(200);
     create.form.fadeOut(200);
     rename.form.fadeOut(200);
-    create.button.data("opened", false);
+    remove.form.fadeOut(200);
-    rename.button.data("opened", false);
   });
 });

templates/browse.tmpl

@@ -53,7 +53,16 @@
   </div>
 </main>
 
-<div class="foreground hidden"></div>
+<div id="foreground" class="hidden"></div>
+
+<form class="popup hidden" id="delete">
+  <h3>Delete</h3>
+  <p>Are you sure you want to delete "<span></span>"?</p>
+  <p class="right">
+    <button class="close" class="darker">No</button>
+    <input type="submit" value="Yes, I am">
+  </p>
+</form>
 
 <form class="popup hidden" id="new">
   <h3>New file</h3>