From dabbd45c509b03d871ffe4e53e2924e48ab7ea17 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 5 Nov 2018 15:45:08 +0530 Subject: [PATCH] fix(router): error handling for use in non-desk environment --- frappe/public/js/frappe/router.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 4f6b47fb32..9291386dc9 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -4,6 +4,7 @@ // route urls to their virtual pages // re-route map (for rename) +frappe.provide('frappe.views'); frappe.re_route = {"#login": ""}; frappe.route_titles = {}; frappe.route_flags = {}; @@ -49,7 +50,9 @@ frappe.route = function() { } else { // show page const route_name = frappe.utils.xss_sanitise(route[0]); - frappe.views.pageview.show(route_name); + if (frappe.views.pageview) { + frappe.views.pageview.show(route_name); + } } @@ -146,9 +149,10 @@ frappe.set_route = function() { window.location.hash = route; // Set favicon (app.js) + frappe.provide('frappe.app'); frappe.app.set_favicon && frappe.app.set_favicon(); setTimeout(() => { - frappe.after_ajax(() => { + frappe.after_ajax && frappe.after_ajax(() => { resolve(); }); }, 100);