Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-29 09:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into thread_options

Browse Source 
Conflicts:
	public/src/templates.js
This commit is contained in:
Julian Lam
2013-05-07 12:56:21 -04:00
parent 250c70bdfc ace64cec7b
commit 7bbc630dfb
14 changed files with 163 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/ajaxify.js
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);

16
public/src/templates.js
View File

@@ -1,7 +1,12 @@
var templates = {};
(function() {
var ready_callback;
var ready_callback,
config;
templates.get_custom_map = function(tpl) {
return (config['custom_mapping'] && config['custom_mapping'][tpl]) ? config['custom_mapping'][tpl] : tpl;
}
templates.ready = function(callback) {
//quick implementation because introducing a lib to handle several async callbacks
@@ -21,6 +26,10 @@ var templates = {};
var timestamp = new Date().getTime();
var loaded = templatesToLoad.length;
$.getJSON('/templates/config.json', function(data) {
config = data;
});
for (var t in templatesToLoad) {
(function(file) {
$.get('/templates/' + file + '.tpl?v=' + timestamp, function(html) {
@@ -146,7 +155,10 @@ function load_template(callback) {
url = (url === '' || url === '/') ? 'home' : url;
jQuery.get(API_URL + url, function(data) {
document.getElementById('content').innerHTML = templates[url.split('/')[0]].parse(JSON.parse(data));
var tpl = url.split('/')[0];
tpl = templates.get_custom_map(tpl);
document.getElementById('content').innerHTML = templates[tpl].parse(JSON.parse(data));
if (callback) callback();
});
}