From 32d87a92c31e94b8d46a31fe27759fa3923154e8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 27 Sep 2017 17:23:12 +0530 Subject: [PATCH] [fix] revert to fallback if socketio does not start the first time (#4198) --- frappe/public/js/frappe/socketio_client.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index 15b50f2ada..1512f487e6 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -291,6 +291,7 @@ frappe.socketio.SocketIOUploader = class SocketIOUploader { } this.reader.readAsArrayBuffer(slice); + this.started = true; this.keep_alive(); }); @@ -338,6 +339,8 @@ frappe.socketio.SocketIOUploader = class SocketIOUploader { this.chunk_size = chunk_size; this.callback = callback; this.on_progress = on_progress; + this.fallback = fallback; + this.started = false; this.reader.onload = () => { frappe.socketio.socket.emit('upload-accept-slice', { @@ -359,8 +362,16 @@ frappe.socketio.SocketIOUploader = class SocketIOUploader { clearTimeout (this.next_check); } this.next_check = setTimeout (() => { + if (!this.started) { + // upload never started, so try fallback + if (this.fallback) { + this.fallback(); + } else { + this.disconnect(); + } + } this.disconnect(); - }, 5000); + }, 3000); } disconnect(with_message = true) {