Skip to content

fix #2750 #2757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2018
Merged

fix #2750 #2757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions qiita_pet/static/vendor/js/resumable-uploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
$('#sync').hide();
$this.resumable.opts.query['alias_sites'] = $('#alias_sites').val();
// Add the file
$this.addFile(file);
$this.addFile(file, true);
// We want to upload when files are added
$this.progressContainer.show();
$this.resumable.upload();
Expand All @@ -116,7 +116,7 @@
}

// Add a new file (or rather: glue between newly added resumable files and the UI)
this.addFile = function(resumableFile){
this.addFile = function(resumableFile, checkDuplicates=false){
// A list and and edit item for the UI
fileName = resumableFile.fileName
dirId = resumableFile.dirid
Expand Down Expand Up @@ -151,6 +151,15 @@

html = html + '</div>';
listNode.html(html);
if (checkDuplicates) {
_.each(this.uploaderList.children(), function(div) {
var div = $(div);
var label = $(div.find('label')[0]).text();
if (label.startsWith(fileName)) {
div.remove();
}
})
}
this.uploaderList.append(listNode);

var editNode = $(document.createElement('div'));
Expand Down