[fix] frappe.ready

8 years ago · 3076b2cc7a
--- 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);
 }

--- 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()

--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -33,16 +33,12 @@
 		{%- block style %}{%- endblock -%}
 	{%- endblock -%}
    <script>
    window.frappe = {
    	page_ready_events: {},
    	ready: function(fn) {
    		if (!frappe.page_ready_events[location.pathname]) {
    			frappe.page_ready_events[location.pathname] = []
    		}
    		frappe.page_ready_events[location.pathname].push(fn);
    	}
    }
    window.dev_server = {{ dev_server }};
 		window.frappe = {};
 		frappe.ready_events = [];
 		frappe.ready = function(fn) {
 			frappe.ready_events.push(fn);
 		}
 		window.dev_server = {{ dev_server }};
    </script>
 </head>
 <body data-path="{{ path }}">
--- 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) {