4 files changed, 132 insertions, 5 deletions

diff --git a/assets/js/src/App.js b/assets/js/src/App.js
index d44d9f81..33b3c6b1 100644
--- a/assets/js/src/App.js
+++ b/assets/js/src/App.js
@@ -9,6 +9,7 @@ function App() {
     this.task = new Task();
     this.project = new Project();
     this.subtask = new Subtask();
+    this.file = new FileUpload(this);
     this.keyboardShortcuts();
     this.chosen();
     this.poll();
@@ -39,6 +40,7 @@ App.prototype.listen = function() {
     this.task.listen();
     this.swimlane.listen();
     this.subtask.listen();
+    this.file.listen();
     this.search.focus();
     this.autoComplete();
     this.datePicker();
diff --git a/assets/js/src/Dropdown.js b/assets/js/src/Dropdown.js
index 146a3c17..61738da9 100644
--- a/assets/js/src/Dropdown.js
+++ b/assets/js/src/Dropdown.js
@@ -26,11 +26,11 @@ Dropdown.prototype.listen = function() {
         var submenuHeight = clone.outerHeight();
         var submenuWidth = clone.outerWidth();
 
-        if (offset.top + submenuHeight - $(window).scrollTop() > $(window).height()) {
-            clone.css('top', offset.top - submenuHeight - 5);
+        if (offset.top + submenuHeight - $(window).scrollTop() < $(window).height() || $(window).scrollTop() + offset.top < submenuHeight) {
+            clone.css('top', offset.top + $(this).height());
         }
         else {
-            clone.css('top', offset.top + $(this).height());
+            clone.css('top', offset.top - submenuHeight - 5);
         }
 
         if (offset.left + submenuWidth > $(window).width()) {
diff --git a/assets/js/src/FileUpload.js b/assets/js/src/FileUpload.js
new file mode 100644
index 00000000..a8816bcd
--- /dev/null
+++ b/assets/js/src/FileUpload.js
@@ -0,0 +1,124 @@
+function FileUpload(app) {
+    this.app = app;
+    this.files = [];
+    this.currentFile = 0;
+}
+
+FileUpload.prototype.listen = function() {
+    var dropzone = document.getElementById("file-dropzone");
+    var self = this;
+
+    if (dropzone) {
+        dropzone.ondragover = dropzone.ondragenter = function(e) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
+
+        dropzone.ondrop = function(e) {
+            e.stopPropagation();
+            e.preventDefault();
+            self.files = e.dataTransfer.files;
+            self.show();
+            $("#file-error-max-size").hide();
+        }
+
+        $(document).on("click", "#file-browser", function(e) {
+            e.preventDefault();
+            $("#file-form-element").get(0).click();
+        });
+
+        $(document).on("click", "#file-upload-button", function(e) {
+            e.preventDefault();
+            self.currentFile = 0;
+            self.checkFiles();
+        });
+
+        $("#file-form-element").change(function() {
+            self.files = document.getElementById("file-form-element").files;
+            self.show();
+            $("#file-error-max-size").hide();
+        });
+    }
+};
+
+FileUpload.prototype.show = function() {
+    $("#file-list").remove();
+
+    if (this.files.length > 0) {
+        $("#file-upload-button").prop("disabled", false);
+        $("#file-dropzone-inner").hide();
+
+        var ul = jQuery("<ul>", {"id": "file-list"});
+
+        for (var i = 0; i < this.files.length; i++) {
+            var percentage = jQuery("<span>", {"id": "file-percentage-" + i}).append("(0%)");
+            var progress = jQuery("<progress>", {"id": "file-progress-" + i, "value": 0});
+            var li = jQuery("<li>", {"id": "file-label-" + i})
+                .append(progress)
+                .append("&nbsp;")
+                .append(this.files[i].name)
+                .append("&nbsp;")
+                .append(percentage);
+
+            ul.append(li);
+        }
+
+        $("#file-dropzone").append(ul);
+    } else {
+        $("#file-dropzone-inner").show();
+    }
+};
+
+FileUpload.prototype.checkFiles = function() {
+    var max = parseInt($("#file-dropzone").data("max-size"));
+
+    for (var i = 0; i < this.files.length; i++) {
+        if (this.files[i].size > max) {
+            $("#file-error-max-size").show();
+            $("#file-label-" + i).addClass("file-error");
+            $("#file-upload-button").prop("disabled", true);
+            return;
+        }
+    }
+
+    this.uploadFiles();
+};
+
+FileUpload.prototype.uploadFiles = function() {
+    if (this.files.length > 0) {
+        this.uploadFile(this.files[this.currentFile]);
+    }
+};
+
+FileUpload.prototype.uploadFile = function(file) {
+    var dropzone = document.getElementById("file-dropzone");
+    var url = dropzone.dataset.url;
+    var xhr = new XMLHttpRequest();
+    var fd = new FormData();
+
+    xhr.upload.addEventListener("progress", this.updateProgress.bind(this));
+    xhr.upload.addEventListener("load", this.transferComplete.bind(this));
+
+    xhr.open("POST", url, true);
+    fd.append('files[]', file);
+    xhr.send(fd);
+};
+
+FileUpload.prototype.updateProgress = function(e) {
+    if (e.lengthComputable) {
+        $("#file-progress-" + this.currentFile).val(e.loaded / e.total);
+        $("#file-percentage-" + this.currentFile).text('(' + Math.floor((e.loaded / e.total) * 100) + '%)');
+    }
+};
+
+FileUpload.prototype.transferComplete = function() {
+    this.currentFile++;
+
+    if (this.currentFile < this.files.length) {
+        this.uploadFile(this.files[this.currentFile]);
+    } else {
+        $("#file-upload-button").prop("disabled", true);
+        $("#file-upload-button").parent().hide();
+        $("#file-done").show();
+    }
+};
diff --git a/assets/js/src/Popover.js b/assets/js/src/Popover.js
index a5ec647c..5614de85 100644
--- a/assets/js/src/Popover.js
+++ b/assets/js/src/Popover.js
@@ -35,10 +35,11 @@ Popover.prototype.onClick = function(e) {
     e.preventDefault();
     e.stopPropagation();
 
-    var link = e.target.getAttribute("href");
+    var target = e.currentTarget || e.target;
+    var link = target.getAttribute("href");
 
     if (! link) {
-        link = e.target.getAttribute("data-href");
+        link = target.getAttribute("data-href");
     }
 
     if (link) {