summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorSimon Birnbach <simon@simon-birnbach.de>2012-04-15 16:47:53 +0200
committerSimon Birnbach <simon@simon-birnbach.de>2012-04-15 16:47:53 +0200
commit8e27b725ba2aa26cb9037b44b18ff800649017b1 (patch)
treedeff0a6c3a4ada98ccc506e8c20f464a015dd9b9 /files
parenta384fcb99fc3a12d7dac937398bf827c79e86098 (diff)
downloadnextcloud-server-8e27b725ba2aa26cb9037b44b18ff800649017b1.tar.gz
nextcloud-server-8e27b725ba2aa26cb9037b44b18ff800649017b1.zip
Fixed cancelling upload of same file to folder and subfolder
Diffstat (limited to 'files')
-rw-r--r--files/css/files.css1
-rw-r--r--files/js/files.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/files/css/files.css b/files/css/files.css
index 4d2b749bf8c..544b323bb29 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -62,6 +62,7 @@ table tr[data-type="dir"] td.filename a.name {font-weight:bold; }
table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; }
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
+// TODO fix usability bug (accidental file/folder selection)
//table td.filename .nametext { width:60%; }
table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
table td.filename form { float:left; font-size:.85em; }
diff --git a/files/js/files.js b/files/js/files.js
index 89101ce4b8f..a7a4d3077c1 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -172,6 +172,7 @@ $(document).ready(function() {
});
// drag&drop support using jquery.fileupload
+ // TODO use OC.dialogs
$(document).bind('drop dragover', function (e) {
e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
});
@@ -242,6 +243,7 @@ $(document).ready(function() {
$('#notification').fadeIn();
}
});
+ uploadingFiles[dirName+"/"+files[i].name] = jqXHR;
} else {
var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i]})
.success(function(result, textStatus, jqXHR) {
@@ -270,8 +272,8 @@ $(document).ready(function() {
$('#notification').fadeIn();
}
});
+ uploadingFiles[files[i].name] = jqXHR;
}
- uploadingFiles[files[i].name] = jqXHR;
}
}else{
data.submit().success(function(data, status) {