diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 420ac53712..461c3b0f7e 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -12,7 +12,7 @@ {%- block head -%} {%- if meta_description is defined %} - + {%- endif -%} {%- for link in web_include_js %} diff --git a/frappe/templates/generators/blog_post.html b/frappe/templates/generators/blog_post.html index bac1f1d6bb..816657c868 100644 --- a/frappe/templates/generators/blog_post.html +++ b/frappe/templates/generators/blog_post.html @@ -27,7 +27,7 @@ $(function() { if(window.logged_in && getCookie("system_user")==="yes") { frappe.has_permission("Blog Post", "{{ name }}", "write", function(r) { - frappe.require("assets/frappe/js/frappe/website/editable.js"); + frappe.require("/assets/frappe/js/frappe/website/editable.js"); frappe.make_editable($('[itemprop="articleBody"]'), "Blog Post", "{{ name }}", "content"); }); } diff --git a/frappe/templates/generators/web_page.html b/frappe/templates/generators/web_page.html index 46b667eed6..9f72ac7908 100644 --- a/frappe/templates/generators/web_page.html +++ b/frappe/templates/generators/web_page.html @@ -43,7 +43,7 @@ $(function() { if(window.logged_in && getCookie("system_user")==="yes") { frappe.has_permission("Web Page", "{{ docname }}", "write", function(r) { - frappe.require("assets/frappe/js/frappe/website/editable.js"); + frappe.require("/assets/frappe/js/frappe/website/editable.js"); frappe.make_editable($(".web-page-content"), "Web Page", "{{ docname }}", "main_section"); }); } diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index ccae9a932b..f292204703 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -236,7 +236,7 @@ $.extend(frappe, { return // our custom logic - if (link.href.indexOf("cmd=")!==-1) + if (link.href.indexOf("cmd=")!==-1 || link.hasAttribute("dont-use-ajax")) return event.preventDefault() @@ -255,6 +255,11 @@ $.extend(frappe, { frappe.render_json(data); }).always(function() { NProgress.done(); + }).fail(function(xhr, status, error) { + if(!xhr.responseText && status==="error") { + // ajax failed without response. Try reloading the full page. + window.location.reload(); + } }); }, render_json: function(data) { @@ -442,7 +447,7 @@ $(document).ready(function() { // switch to app link if(getCookie("system_user")==="yes") { $("#website-post-login .dropdown-menu").append('
\ -