From 3076b2cc7a6befec12dcd045db36cf93c1b99a48 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 31 Mar 2017 16:36:33 +0530 Subject: [PATCH] [fix] frappe.ready --- frappe/public/js/frappe/provide.js | 5 ----- frappe/sessions.py | 2 +- frappe/templates/base.html | 16 ++++++---------- frappe/website/js/website.js | 14 ++++---------- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/frappe/public/js/frappe/provide.js b/frappe/public/js/frappe/provide.js index 25dd07e101..145cf9ede6 100644 --- a/frappe/public/js/frappe/provide.js +++ b/frappe/public/js/frappe/provide.js @@ -27,8 +27,3 @@ frappe.provide("frappe.ui"); frappe.provide("frappe.modules"); frappe.provide("frappe.templates"); -frappe.ready_events = []; -frappe.ready = function(fn) { - frappe.ready_events.push(fn); -} - diff --git a/frappe/sessions.py b/frappe/sessions.py index af72c3d36b..86ee1a6d12 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -42,7 +42,7 @@ def clear_cache(user=None): frappe.defaults.clear_cache(user) else: for name in groups: - cache.delete_key(name, user) + cache.delete_key(name) clear_global_cache() frappe.defaults.clear_cache() diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 2395281233..9b7d48e1f8 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -33,16 +33,12 @@ {%- block style %}{%- endblock -%} {%- endblock -%} diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index adb53cbfd6..1f77caa72a 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -250,17 +250,11 @@ $.extend(frappe, { }, trigger_ready: function() { - var ready_functions = frappe.page_ready_events[location.pathname]; - if (ready_functions && ready_functions.length) { - for (var i=0, l=ready_functions.length; i < l; i++) { - var ready = ready_functions[i]; - ready && ready(); - } - } - - // remove them so that they aren't fired again and again! - delete frappe.page_ready_events[location.pathname]; + frappe.ready_events.forEach(function(fn) { + fn(); + }); }, + highlight_code_blocks: function() { if(hljs) { $('pre code').each(function(i, block) {