Merge remote-tracking branch 'origin' into thread_options

Conflicts:
	public/src/templates.js
This commit is contained in:
Julian Lam
2013-05-07 12:56:21 -04:00
14 changed files with 163 additions and 55 deletions

View File

@@ -30,6 +30,7 @@ var ajaxify = {};
var url = url.replace(/\/$/, "");
var tpl_url = (url === '' || url === '/') ? 'home' : url.split('/')[0];
tpl_url = templates.get_custom_map(tpl_url);
if (templates[tpl_url]) {
window.history.pushState({}, url, "/" + url);