From b748a832a28a0efb0d2d3cc713b936a1a47f9767 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Jun 2014 10:21:54 +0700 Subject: [PATCH 1/4] Fix client side template mapping --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 5c82a9852a..d07eff3c97 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -153,7 +153,7 @@ var ajaxify = ajaxify || {}; var tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]); if (tpl_url === false && !templates[url]) { - tpl_url = url.split('/'); + tpl_url = ajaxify.removeRelativePath(url).split('/'); while(tpl_url.length) { if (ajaxify.isTemplateAvailable(tpl_url.join('/'))) { From be06d386e5a0517fd4727dfa0453b8155cfe9d15 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Jun 2014 10:25:03 +0700 Subject: [PATCH 2/4] Revert change to ajaxify.js --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index d07eff3c97..5c82a9852a 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -153,7 +153,7 @@ var ajaxify = ajaxify || {}; var tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]); if (tpl_url === false && !templates[url]) { - tpl_url = ajaxify.removeRelativePath(url).split('/'); + tpl_url = url.split('/'); while(tpl_url.length) { if (ajaxify.isTemplateAvailable(tpl_url.join('/'))) { From 23a88492a6947b8240580ffb5a8216a533261e24 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Jun 2014 10:25:48 +0700 Subject: [PATCH 3/4] Get template mapping after removing relative path --- public/src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 242f874e72..992182b261 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -513,10 +513,10 @@ var socket, var url = window.location.pathname.slice(1).replace(/\/$/, ""), search = window.location.search, hash = window.location.hash, - tpl_url = ajaxify.getTemplateMapping(url), $window = $(window); url = ajaxify.removeRelativePath(url); + tpl_url = ajaxify.getTemplateMapping(url); ajaxify.widgets.render(tpl_url, url); From 6e50016a115807977eb4ef4616ca6a07215c5639 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Jun 2014 10:28:57 +0700 Subject: [PATCH 4/4] Cleanup the vars --- public/src/app.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 992182b261..cbc7a46db0 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -510,14 +510,12 @@ var socket, app.load = function() { $('document').ready(function () { - var url = window.location.pathname.slice(1).replace(/\/$/, ""), + var url = ajaxify.removeRelativePath(window.location.pathname.slice(1).replace(/\/$/, "")), + tpl_url = ajaxify.getTemplateMapping(url), search = window.location.search, hash = window.location.hash, $window = $(window); - url = ajaxify.removeRelativePath(url); - tpl_url = ajaxify.getTemplateMapping(url); - ajaxify.widgets.render(tpl_url, url); $window.trigger('action:ajaxify.start', {