vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

frappe/upload.js: Fix undefined socketio object (#6308)

Browse source
This commit is contained in:
Karan Sharma 2018-10-30 11:05:16 +05:30 • committed by Rushabh Mehta
parent a4935e9ae4
commit a8342b1c8a
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
frappe/public/js/frappe/upload.js
View file

@ -310,8 +310,7 @@ frappe.upload = {
const file_not_big_enough = fileobj.size <= 24576;
if (!frappe.socketio || opts.no_socketio ||
frappe.flags.no_socketio || file_not_big_enough) {
if (!frappe.socketio || opts.no_socketio || frappe.flags.no_socketio || frappe.boot.disable_async || file_not_big_enough) {
upload_with_filedata();
return;
} else {
@ -327,24 +326,26 @@ frappe.upload = {
}
var upload_through_socketio = function() {
frappe.socketio.uploader.start({
file: fileobj,
filename: args.filename,
is_private: args.is_private,
fallback: () => {
// if fails, use old filereader
upload_with_filedata();
},
callback: (data) => {
args.file_url = data.file_url;
frappe.upload._upload_file(fileobj, args, opts);
},
on_progress: (percent_complete) => {
let increment = (flt(percent_complete) / frappe.upload.total_files);
frappe.show_progress(__('Uploading'),
start_complete + increment);
}
});
if (frappe.socketio.socket) {
frappe.socketio.uploader.start({
file: fileobj,
filename: args.filename,
is_private: args.is_private,
fallback: () => {
// if fails, use old filereader
upload_with_filedata();
},
callback: (data) => {
args.file_url = data.file_url;
frappe.upload._upload_file(fileobj, args, opts);
},
on_progress: (percent_complete) => {
let increment = (flt(percent_complete) / frappe.upload.total_files);
frappe.show_progress(__('Uploading'),
start_complete + increment);
}
});
}
}
},