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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Nabin Hait 2017-09-27 17:27:04 +05:30
commit da5bdcf513
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '9.0.3'
__version__ = '9.0.4'
__title__ = "Frappe Framework"
local = Local()

13
frappe/public/js/frappe/socketio_client.js
View file

@ -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) {