Mirrors/Teknik
1
0
Fork 0
mirror of https://git.teknik.io/Teknikode/Teknik.git synced 2023-08-02 14:16:22 +02:00
Code Releases Activity

Changed upload to bypass loading of blob if we aren't encrypting client side.

Browse Source
This commit is contained in:
Uncled1023 2017-07-11 21:17:51 -07:00
parent 55bf97fe53
commit afa4394052
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Teknik/Areas/Upload/Scripts/Upload.js
View File

@ -181,8 +181,19 @@ function createUpload(fileName) {
function processFile(fileBlob, fileName, contentType, contentSize, fileID) { function processFile(fileBlob, fileName, contentType, contentSize, fileID) {
// Check the file size // Check the file size
if (contentSize <= maxUploadSize) { if (contentSize <= maxUploadSize) {
// Encrypt the file and upload it
encryptFile(fileBlob, fileName, contentType, fileID, uploadFile); var fileExt = getFileExtension(fileName);
// Get session settings
var encrypt = $('#encrypt').is(':checked');
if (encrypt) {
// Encrypt the file and upload it
encryptFile(fileBlob, fileName, contentType, fileID, uploadFile);
} else {
// pass it along
uploadFile(fileBlob, null, null, contentType, fileExt, fileID, encrypt);
}
} }
else { else {
// An error occured // An error occured