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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2017-07-27 17:59:19 +05:30
commit d384722839
2 changed files with 19 additions and 13 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__ = '8.6.1'
__version__ = '8.6.2'
__title__ = "Frappe Framework"
local = Local()

30
frappe/public/js/frappe/request.js
View file

@ -8,6 +8,8 @@ frappe.request.url = '/';
frappe.request.ajax_count = 0;
frappe.request.waiting_for_ajax = [];
// generic server call (call page, object)
frappe.call = function(opts) {
if(opts.quiet) {
@ -180,7 +182,7 @@ frappe.request.call = function(opts) {
console.log("Unable to handle success response"); // eslint-disable-line
console.trace(e); // eslint-disable-line
}
})
.always(function(data, textStatus, xhr) {
try {
@ -218,8 +220,6 @@ frappe.request.call = function(opts) {
// call execute serverside request
frappe.request.prepare = function(opts) {
frappe.request.ajax_count++;
$("body").attr("data-ajax-state", "triggered");
// btn indicator
@ -258,7 +258,7 @@ frappe.request.cleanup = function(opts, r) {
// un-freeze page
if(opts.freeze) frappe.dom.unfreeze();
if(r) {
// session expired? - Guest has no business here!
@ -304,14 +304,6 @@ frappe.request.cleanup = function(opts, r) {
}
frappe.last_response = r;
frappe.request.ajax_count--;
if(!frappe.request.ajax_count) {
$.each(frappe.request.waiting_for_ajax || [], function(i, fn) {
fn();
});
frappe.request.waiting_for_ajax = [];
}
}
frappe.after_server_call = () => {
@ -413,3 +405,17 @@ frappe.request.cleanup_request_opts = function(request_opts) {
}
return request_opts;
};
$(document).ajaxSend(function() {
frappe.request.ajax_count++;
});
$(document).ajaxComplete(function() {
frappe.request.ajax_count--;
if(!frappe.request.ajax_count) {
$.each(frappe.request.waiting_for_ajax || [], function(i, fn) {
fn();
});
frappe.request.waiting_for_ajax = [];
}
});