Skip to content

Commit

Permalink
plupload helper fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@codesaur
codesaur committed Jan 18, 2024
1 parent ca7f9ef commit 157b9ec
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 82 deletions.
31 changes: 14 additions & 17 deletions src/contents/news-insert.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-

var fileList = document.getElementById('filelist');
var uploadFilesBtn = document.getElementById('uploadfiles');
var currentFileId = null;
var uploader = new plupload.Uploader({
runtimes: 'html5,flash,silverlight,html4',
browse_button: 'pickfiles',
Expand Down Expand Up @@ -425,21 +424,21 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
}
},
UploadProgress: function (up, file) {
currentFileId = file.id;
document.getElementById(file.id).getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-upload"> sending ' + file.percent + '%';
uploadFilesBtn.setAttribute('disabled', '');
},
FileUploaded: function (up, file, response) {
try {
currentFileId = file.id;
var res = JSON.parse(response.response);
if (!res.file)
throw 'Invalid response!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');

let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');
}

filesTable.addFileRow(res);

NotifyTop('primary', "{{ 'success'|text }}", 'Your file [' + file.name + '] was uploaded successfully.');
Expand All @@ -451,13 +450,13 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
else
err = 'Unknown error!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
}
NotifyTop('danger', "{{ 'error'|text }}", err);
} finally {
currentFileId = null;
}

let files = fileList.children;
Expand All @@ -477,15 +476,13 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
}
},
Error: function (up, err) {
if (currentFileId !== null) {
let currentFile = document.getElementById(currentFileId);
if (err.file.id !== null) {
let currentFile = document.getElementById(err.file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> failed';
currentFile.getElementsByTagName('em')[0].innerHTML = err.message;
currentFile.classList.add('text-danger');
currentFileId = null;
}
currentFileId = null;
}

NotifyTop('danger', "{{ 'error'|text }} " + err.code.toString().replace(/\D/g, ''), err.message);
Expand Down
29 changes: 13 additions & 16 deletions src/contents/news-update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>

var fileList = document.getElementById('filelist');
var uploadFilesBtn = document.getElementById('uploadfiles');
var currentFileId = null;
var uploader = new plupload.Uploader({
runtimes: 'html5,flash,silverlight,html4',
browse_button: 'pickfiles',
Expand Down Expand Up @@ -467,20 +466,20 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
}
},
UploadProgress: function (up, file) {
currentFileId = file.id;
document.getElementById(file.id).getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-upload"> sending ' + file.percent + '%';
uploadFilesBtn.setAttribute('disabled', '');
},
FileUploaded: function (up, file, response) {
try {
currentFileId = file.id;
var res = JSON.parse(response.response);
if (!res.file)
throw 'Invalid response!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');
let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');
}

filesTable.addFileRow(res);

Expand All @@ -493,13 +492,13 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
else
err = 'Unknown error!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
}
NotifyTop('danger', "{{ 'error'|text }}", err);
} finally {
currentFileId = null;
}

let files = fileList.children;
Expand All @@ -519,15 +518,13 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
}
},
Error: function (up, err) {
if (currentFileId !== null) {
let currentFile = document.getElementById(currentFileId);
if (err.file.id !== null) {
let currentFile = document.getElementById(err.file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> failed';
currentFile.getElementsByTagName('em')[0].innerHTML = err.message;
currentFile.classList.add('text-danger');
currentFileId = null;
}
currentFileId = null;
}

NotifyTop('danger', "{{ 'error'|text }} " + err.code.toString().replace(/\D/g, ''), err.message);
Expand Down
29 changes: 13 additions & 16 deletions src/contents/page-insert.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-

var fileList = document.getElementById('filelist');
var uploadFilesBtn = document.getElementById('uploadfiles');
var currentFileId = null;
var uploader = new plupload.Uploader({
runtimes: 'html5,flash,silverlight,html4',
browse_button: 'pickfiles',
Expand Down Expand Up @@ -436,20 +435,20 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
}
},
UploadProgress: function (up, file) {
currentFileId = file.id;
document.getElementById(file.id).getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-upload"> sending ' + file.percent + '%';
uploadFilesBtn.setAttribute('disabled', '');
},
FileUploaded: function (up, file, response) {
try {
currentFileId = file.id;
var res = JSON.parse(response.response);
if (!res.file)
throw 'Invalid response!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');
let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');
}

filesTable.addFileRow(res);

Expand All @@ -462,13 +461,13 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
else
err = 'Unknown error!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
}
NotifyTop('danger', "{{ 'error'|text }}", err);
} finally {
currentFileId = null;
}

let files = fileList.children;
Expand All @@ -488,15 +487,13 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
}
},
Error: function (up, err) {
if (currentFileId !== null) {
let currentFile = document.getElementById(currentFileId);
if (err.file.id !== null) {
let currentFile = document.getElementById(err.file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> failed';
currentFile.getElementsByTagName('em')[0].innerHTML = err.message;
currentFile.classList.add('text-danger');
currentFileId = null;
}
currentFileId = null;
}

NotifyTop('danger', "{{ 'error'|text }} " + err.code.toString().replace(/\D/g, ''), err.message);
Expand Down
31 changes: 14 additions & 17 deletions src/contents/page-update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>

var fileList = document.getElementById('filelist');
var uploadFilesBtn = document.getElementById('uploadfiles');
var currentFileId = null;
var uploader = new plupload.Uploader({
runtimes: 'html5,flash,silverlight,html4',
browse_button: 'pickfiles',
Expand Down Expand Up @@ -474,21 +473,21 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
}
},
UploadProgress: function (up, file) {
currentFileId = file.id;
document.getElementById(file.id).getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-upload"> sending ' + file.percent + '%';
uploadFilesBtn.setAttribute('disabled', '');
},
FileUploaded: function (up, file, response) {
try {
currentFileId = file.id;
var res = JSON.parse(response.response);
if (!res.file)
throw 'Invalid response!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');

let currentFile = document.getElementById(file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-check"></i> success';
currentFile.classList.add('text-success');
}

filesTable.addFileRow(res);

NotifyTop('primary', "{{ 'success'|text }}", 'Your file [' + file.name + '] was uploaded successfully.');
Expand All @@ -500,13 +499,13 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
else
err = 'Unknown error!';

let currentFile = document.getElementById(currentFileId);
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
let currentFile = document.getElementById(file.id);
if (currentFile) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> error';
currentFile.getElementsByTagName('em')[0].innerHTML = err;
currentFile.classList.add('text-danger');
}
NotifyTop('danger', "{{ 'error'|text }}", err);
} finally {
currentFileId = null;
}

let files = fileList.children;
Expand All @@ -526,15 +525,13 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
}
},
Error: function (up, err) {
if (currentFileId !== null) {
let currentFile = document.getElementById(currentFileId);
if (err.file.id !== null) {
let currentFile = document.getElementById(err.file.id);
if (currentFile !== null) {
currentFile.getElementsByTagName('b')[0].innerHTML = '<i class="bi bi-x"> failed';
currentFile.getElementsByTagName('em')[0].innerHTML = err.message;
currentFile.classList.add('text-danger');
currentFileId = null;
}
currentFileId = null;
}

NotifyTop('danger', "{{ 'error'|text }} " + err.code.toString().replace(/\D/g, ''), err.message);
Expand Down

0 comments on commit 157b9ec

Please sign in to comment.