hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed templates config and mapping 🐑

Browse Source
v1.18.x
barisusakli 10 years ago
parent 5821a0758f
commit 2a8437f08f
12 changed files with 208 additions and 404 deletions
Show Stats Download Patch File Download Diff File

137
public/src/ajaxify.js
Unescape Escape View File

@ -3,14 +3,13 @@
var ajaxify = ajaxify || {};
$(document).ready(function() {
require(['templates'], function (templatesModule) {
/*global app, templates, utils, socket, translator, config, RELATIVE_PATH*/
var location = document.location || window.location,
rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''),
apiXHR = null;
window.onpopstate = function (event) {
if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) {
ajaxify.go(event.state.url, function() {
@ -22,35 +21,6 @@ $(document).ready(function() {
ajaxify.currentPage = null;
ajaxify.initialLoad = false;
function onAjaxError(err, url, callback, quiet) {
var data = err.data,
textStatus = err.textStatus;
if (data) {
var status = parseInt(data.status, 10);
if (status === 403 || status === 404 || status === 500) {
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback);
} else if (status === 401) {
app.alertError('[[global:please_log_in]]');
app.previousUrl = url;
return ajaxify.go('login');
} else if (status === 302) {
if (data.responseJSON.path) {
if (!ajaxify.go(data.responseJSON.path, callback, quiet)) {
window.location.href = data.responseJSON.path;
}
} else if (data.responseJSON) {
ajaxify.go(data.responseJSON.slice(1), callback, quiet);
}
}
} else if (textStatus !== 'abort') {
app.alertError(data.responseJSON.error);
}
}
ajaxify.go = function (url, callback, quiet) {
// "quiet": If set to true, will not call pushState
app.enterRoom('');
@ -64,16 +34,13 @@ $(document).ready(function() {
// Remove relative path and trailing slash
url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
var tpl_url = ajaxify.getTemplateMapping(url);
$(window).trigger('action:ajaxify.start', {url: url, tpl_url: tpl_url});
$(window).trigger('action:ajaxify.start', {url: url});
var hash = '';
if(ajaxify.initialLoad) {
hash = window.location.hash ? window.location.hash : '';
}
if (ajaxify.isTemplateAvailable(tpl_url) && !!!templatesModule.config.force_refresh[tpl_url]) {
ajaxify.currentPage = url;
if (window.history && window.history.pushState) {
@ -82,8 +49,6 @@ $(document).ready(function() {
}, url, RELATIVE_PATH + '/' + url + hash);
}
translator.load(config.defaultLang, tpl_url);
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
var startTime = (new Date()).getTime();
@ -94,7 +59,11 @@ $(document).ready(function() {
return onAjaxError(err, url, callback, quiet);
}
renderTemplate(url, tpl_url, data, startTime, callback);
app.template = data.template.name;
translator.load(config.defaultLang, data.template.name);
renderTemplate(url, data.template.name, data, startTime, callback);
require(['search'], function(search) {
search.topicDOM.end();
@ -102,11 +71,36 @@ $(document).ready(function() {
});
return true;
}
return false;
};
function onAjaxError(err, url, callback, quiet) {
var data = err.data,
textStatus = err.textStatus;
if (data) {
var status = parseInt(data.status, 10);
if (status === 403 || status === 404 || status === 500) {
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback);
} else if (status === 401) {
app.alertError('[[global:please_log_in]]');
app.previousUrl = url;
return ajaxify.go('login');
} else if (status === 302) {
if (data.responseJSON.path) {
if (!ajaxify.go(data.responseJSON.path, callback, quiet)) {
window.location.href = data.responseJSON.path;
}
} else if (data.responseJSON) {
ajaxify.go(data.responseJSON.slice(1), callback, quiet);
}
}
} else if (textStatus !== 'abort') {
app.alertError(data.responseJSON.error);
}
}
function renderTemplate(url, tpl_url, data, startTime, callback) {
var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2;
$(window).trigger('action:ajaxify.loadingTemplates', {});
@ -119,7 +113,7 @@ $(document).ready(function() {
ajaxify.variables.parse();
ajaxify.widgets.render(tpl_url, url, function() {
$(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url});
$(window).trigger('action:ajaxify.end', {url: url});
});
$(window).trigger('action:ajaxify.contentLoaded', {url: url});
@ -168,60 +162,12 @@ $(document).ready(function() {
});
};
ajaxify.isTemplateAvailable = function(tpl) {
return $.inArray(tpl + '.tpl', templatesModule.available) !== -1;
};
ajaxify.getTemplateMapping = function(url) {
var tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]);
if (tpl_url === false && !templates[url]) {
tpl_url = url.split('/');
while(tpl_url.length) {
if (ajaxify.isTemplateAvailable(tpl_url.join('/'))) {
tpl_url = tpl_url.join('/');
break;
}
tpl_url.pop();
}
if (!tpl_url.length) {
tpl_url = url.split('/')[0].split('?')[0];
}
} else if (templates[url]) {
tpl_url = url;
}
return tpl_url;
};
ajaxify.getCustomTemplateMapping = function(tpl) {
if (templatesModule.config && templatesModule.config.custom_mapping && tpl !== undefined) {
for (var pattern in templatesModule.config.custom_mapping) {
if (templatesModule.config.custom_mapping.hasOwnProperty(pattern)) {
var match = tpl.match(pattern);
if (match && match[0] === tpl) {
return (templatesModule.config.custom_mapping[pattern]);
}
}
}
}
return false;
};
ajaxify.loadData = function(url, callback) {
url = ajaxify.removeRelativePath(url);
$(window).trigger('action:ajaxify.loadingData', {url: url});
var location = document.location || window.location,
tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]);
if (!tpl_url) {
tpl_url = ajaxify.getTemplateMapping(url);
}
var location = document.location || window.location;
apiXHR = $.ajax({
url: RELATIVE_PATH + '/api/' + url,
@ -263,9 +209,8 @@ $(document).ready(function() {
}
};
$('document').ready(function () {
function ajaxifyAnchors() {
templates.registerLoader(ajaxify.loadTemplate);
templatesModule.refresh(app.load);
if (!window.history || !window.history.pushState) {
return; // no ajaxification for old browsers
@ -297,7 +242,6 @@ $(document).ready(function() {
window.location.hash = this.hash;
}
ajaxify.loadScript(ajaxify.getTemplateMapping(url));
e.preventDefault();
} else {
if (ajaxify.go(url)) {
@ -316,8 +260,9 @@ $(document).ready(function() {
}
}
});
}
});
ajaxifyAnchors();
app.load();
});
});

11
public/src/app.js
Unescape Escape View File

@ -482,16 +482,12 @@ app.cacheBuster = null;
app.load = function() {
$('document').ready(function () {
var url = ajaxify.removeRelativePath(window.location.pathname.slice(1).replace(/\/$/, "")),
tpl_url = ajaxify.getTemplateMapping(url),
tpl_url = app.template,
search = window.location.search,
hash = window.location.hash,
$window = $(window);
$window.trigger('action:ajaxify.start', {
url: url,
tpl_url: tpl_url
});
$window.trigger('action:ajaxify.start', {url: url});
collapseNavigationOnClick();
@ -532,8 +528,7 @@ app.cacheBuster = null;
ajaxify.widgets.render(tpl_url, url, function() {
app.processPage();
$window.trigger('action:ajaxify.end', {
url: url,
tpl_url: tpl_url
url: url
});
});
});

2
public/src/client/categories.js
Unescape Escape View File

@ -6,7 +6,7 @@ define('forum/categories', function() {
var categories = {};
$(window).on('action:ajaxify.start', function(ev, data) {
if (data.tpl_url !== 'categories') {
if (ajaxify.currentPage !== data.url) {
socket.removeListener('event:new_post', categories.onNewPost);
}
});

2
public/src/client/category.js
Unescape Escape View File

@ -13,7 +13,7 @@ define('forum/category', [
var Category = {};
$(window).on('action:ajaxify.start', function(ev, data) {
if(data && data.tpl_url !== 'category') {
if (ajaxify.currentPage !== data.url) {
navigator.hide();
removeListeners();

2
public/src/client/recent.js
Unescape Escape View File

@ -9,7 +9,7 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) {
newPostCount = 0;
$(window).on('action:ajaxify.start', function(ev, data) {
if (data.tpl_url !== 'recent') {
if (ajaxify.currentPage !== data.url) {
Recent.removeListeners();
}
});

2
public/src/client/topic.js
Unescape Escape View File

@ -18,7 +18,7 @@ define('forum/topic', [
currentUrl = '';
$(window).on('action:ajaxify.start', function(ev, data) {
if(data.tpl_url !== 'topic') {
if (ajaxify.currentPage !=== data.url) {
navigator.hide();
$('.header-topic-title').find('span').text('').hide();
app.removeAlert('bookmark');

2
public/src/client/unread.js
Unescape Escape View File

@ -6,7 +6,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'],
var Unread = {};
$(window).on('action:ajaxify.start', function(ev, data) {
if (data.tpl_url !== 'unread') {
if (ajaxify.currentPage !== data.url) {
recent.removeListeners();
}
});

20
public/src/modules/templates.js
Unescape Escape View File

@ -1,20 +0,0 @@
"use strict";
/*globals define, RELATIVE_PATH*/
define('templates', function() {
var Templates = {};
Templates.refresh = function(callback) {
$.getJSON(RELATIVE_PATH + '/api/get_templates_listing', function (data) {
Templates.config = data.templatesConfig;
Templates.available = data.availableTemplates;
if (callback) {
callback();
}
});
};
return Templates;
});

90
src/controllers/templates.js
Unescape Escape View File

@ -1,90 +0,0 @@
"use strict";
var async = require('async'),
nconf = require('nconf'),
fs = require('fs'),
path = require('path'),
meta = require('../meta'),
plugins = require('../plugins'),
utils = require('../../public/src/utils'),
templatesController = {};
var availableTemplatesCache = null;
var configCache = null;
templatesController.getTemplatesListing = function(req, res, next) {
async.parallel({
availableTemplates: function(next) {
getAvailableTemplates(next);
},
templatesConfig: function(next) {
async.waterfall([
function(next) {
readConfigFile(next);
},
function(config, next) {
config.custom_mapping['^/?$'] = meta.config.homePageRoute || 'categories';
plugins.fireHook('filter:templates.get_config', config, next);
}
], next);
},
}, function(err, results) {
if (err) {
return next(err);
}
res.json(results);
});
};
function readConfigFile(callback) {
if (configCache) {
return callback(null, configCache);
}
fs.readFile(path.join(nconf.get('views_dir'), 'config.json'), function(err, config) {
if (err) {
return callback(err);
}
try {
config = JSON.parse(config.toString());
} catch (err) {
return callback(err);
}
configCache = config;
callback(null, config);
});
}
function getAvailableTemplates(callback) {
if (availableTemplatesCache) {
return callback(null, availableTemplatesCache);
}
async.parallel({
views: function(next) {
utils.walk(nconf.get('views_dir'), next);
},
extended: function(next) {
plugins.fireHook('filter:templates.get_virtual', [], next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
var availableTemplates = results.views.filter(function(value, index, self) {
return value && self.indexOf(value) === index;
}).map(function(el) {
return el && el.replace(nconf.get('views_dir') + '/', '');
});
availableTemplatesCache = availableTemplates.concat(results.extended);
callback(null, availableTemplatesCache);
});
}
module.exports = templatesController;

5
src/middleware/middleware.js
Unescape Escape View File

@ -348,6 +348,9 @@ middleware.renderHeader = function(req, res, callback) {
templateValues.customJS = results.customJS;
templateValues.maintenanceHeader = parseInt(meta.config.maintenanceMode, 10) === 1 && !results.isAdmin;
templateValues.template = {name: res.locals.template};
templateValues.template[res.locals.template] = true;
app.render('header', templateValues, callback);
});
});
@ -378,6 +381,7 @@ middleware.processRender = function(req, res, next) {
options.loggedIn = req.user ? parseInt(req.user.uid, 10) !== 0 : false;
options.template = {name: template};
options.template[template] = true;
res.locals.template = template;
if ('function' !== typeof fn) {
fn = defaultFn;
@ -453,7 +457,6 @@ middleware.maintenanceMode = function(req, res, next) {
'/nodebb.min.js',
'/vendor/fontawesome/fonts/fontawesome-webfont.woff',
'/src/modules/[\\w]+\.js',
'/api/get_templates_listing',
'/api/login',
'/api/?',
'/language/.+'

4
src/routes/api.js
Unescape Escape View File

@ -4,8 +4,7 @@ var express = require('express'),
posts = require('../posts'),
categories = require('../categories'),
uploadsController = require('../controllers/uploads'),
templatesController = require('../controllers/templates');
uploadsController = require('../controllers/uploads');
module.exports = function(app, middleware, controllers) {
@ -17,7 +16,6 @@ module.exports = function(app, middleware, controllers) {
router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
router.get('/post/:pid', controllers.posts.getPost);
router.get('/get_templates_listing', templatesController.getTemplatesListing);
router.get('/categories/:cid/moderators', getModerators);
router.get('/recent/posts/:term?', getRecentPosts);

27
src/views/config.json
Unescape Escape View File

@ -1,27 +0,0 @@
{
"custom_mapping": {
"^\/?$": "categories",
"^admin?$": "admin/general/dashboard",
"^users/sort-posts": "users",
"^users/latest": "users",
"^users/sort-reputation": "users",
"^users/search": "users",
"^user/.*/edit": "account/edit",
"^user/.*/following": "account/following",
"^user/.*/followers": "account/followers",
"^user/.*/settings": "account/settings",
"^user/.*/favourites": "account/favourites",
"^user/.*/watched": "account/watched",
"^user/.*/posts": "account/posts",
"^user/.*/topics": "account/topics",
"^user/.*/groups": "account/groups",
"^user/[^\/]+": "account/profile",
"^reset/.*": "reset_code",
"^tags/.*": "tag",
"^groups/?$": "groups/list",
"^groups/.*": "groups/details"
},
"force_refresh": {
"logout": true
}
}
Write Preview
Loading…
Cancel
Save