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

formatting - core client side

Browse Source
v1.18.x
psychobunny 12 years ago
parent 828d937dec
commit dc41c6bc0d
3 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File

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

@ -12,7 +12,7 @@ var ajaxify = {};
var events = []; var events = [];
ajaxify.register_events = function(new_page_events) { ajaxify.register_events = function(new_page_events) {
for (var i = 0, ii = events.length; i<ii; i++) { for (var i = 0, ii = events.length; i < ii; i++) {
socket.removeAllListeners(events[i]); // optimize this to user removeListener(event, listener) instead. socket.removeAllListeners(events[i]); // optimize this to user removeListener(event, listener) instead.
} }
@ -42,14 +42,14 @@ var ajaxify = {};
var hash = window.location.hash; var hash = window.location.hash;
if(url.indexOf(RELATIVE_PATH.slice(1)) !== -1) { if (url.indexOf(RELATIVE_PATH.slice(1)) !== -1) {
url = url.slice(RELATIVE_PATH.length); url = url.slice(RELATIVE_PATH.length);
} }
var tpl_url = templates.get_custom_map(url.split('?')[0]); var tpl_url = templates.get_custom_map(url.split('?')[0]);
if (tpl_url == false && !templates[url]) { if (tpl_url == false && !templates[url]) {
if(url === '' || url === '/') { if (url === '' || url === '/') {
tpl_url = 'home'; tpl_url = 'home';
} else { } else {
tpl_url = url.split('/')[0].split('?')[0]; tpl_url = url.split('/')[0].split('?')[0];
@ -79,9 +79,9 @@ var ajaxify = {};
app.process_page(); app.process_page();
jQuery('#content, #footer').stop(true, true).fadeIn(200, function() { jQuery('#content, #footer').stop(true, true).fadeIn(200, function() {
if(window.location.hash) if (window.location.hash)
hash = window.location.hash; hash = window.location.hash;
if(hash) if (hash)
app.scrollToPost(hash.substr(1)); app.scrollToPost(hash.substr(1));
}); });
@ -107,9 +107,9 @@ var ajaxify = {};
return href == 'javascript:;' || href == window.location.href + "#" || href.slice(-1) === "#"; return href == 'javascript:;' || href == window.location.href + "#" || href.slice(-1) === "#";
} }
if(hrefEmpty(this.href)) return; if (hrefEmpty(this.href)) return;
var url = this.href.replace(rootUrl +'/', ''); var url = this.href.replace(rootUrl + '/', '');
if (this.target !== '') return; if (this.target !== '') return;
@ -130,16 +130,16 @@ var ajaxify = {};
}; };
function evalScript(elem) { function evalScript(elem) {
var data = (elem.text || elem.textContent || elem.innerHTML || "" ), var data = (elem.text || elem.textContent || elem.innerHTML || ""),
head = document.getElementsByTagName("head")[0] || head = document.getElementsByTagName("head")[0] ||
document.documentElement, document.documentElement,
script = document.createElement("script"); script = document.createElement("script");
script.type = "text/javascript"; script.type = "text/javascript";
try { try {
script.appendChild(document.createTextNode(data)); script.appendChild(document.createTextNode(data));
} catch(e) { } catch (e) {
script.text = data; script.text = data;
} }
if (elem.src) { if (elem.src) {
@ -159,8 +159,8 @@ var ajaxify = {};
for (i = 0; children_nodes[i]; i++) { for (i = 0; children_nodes[i]; i++) {
child = children_nodes[i]; child = children_nodes[i];
if (nodeName(child, "script" ) && if (nodeName(child, "script") &&
(!child.type || child.type.toLowerCase() === "text/javascript")) { (!child.type || child.type.toLowerCase() === "text/javascript")) {
scripts.push(child); scripts.push(child);
} }
} }

40
public/src/templates.js
Unescape Escape View File

@ -1,6 +1,4 @@
(function(module) {
(function (module) {
var config = {}, var config = {},
templates, templates,
@ -105,7 +103,7 @@
templates.getTemplateNameFromUrl = function(url) { templates.getTemplateNameFromUrl = function(url) {
var parts = url.split('?')[0].split('/'); var parts = url.split('?')[0].split('/');
for(var i=0; i<parts.length; ++i) { for (var i = 0; i < parts.length; ++i) {
if (templates.is_available(parts[i])) { if (templates.is_available(parts[i])) {
return parts[i]; return parts[i];
} }
@ -124,7 +122,7 @@
var trimmed = api_url; var trimmed = api_url;
if(!tpl_url) { if (!tpl_url) {
tpl_url = templates.getTemplateNameFromUrl(api_url); tpl_url = templates.getTemplateNameFromUrl(api_url);
} }
@ -160,7 +158,7 @@
jQuery.get(API_URL + api_url, function(data) { jQuery.get(API_URL + api_url, function(data) {
if(!data) { if (!data) {
ajaxify.go('404'); ajaxify.go('404');
return; return;
} }
@ -177,7 +175,7 @@
function parse_template() { function parse_template() {
if (!templates[tpl_url] || !template_data) return; if (!templates[tpl_url] || !template_data) return;
if(typeof global !== "undefined") if (typeof global !== "undefined")
template_data['relative_path'] = nconf.get('relative_path'); template_data['relative_path'] = nconf.get('relative_path');
else else
template_data['relative_path'] = RELATIVE_PATH; template_data['relative_path'] = RELATIVE_PATH;
@ -187,17 +185,17 @@
jQuery('#content [template-variable]').each(function(index, element) { jQuery('#content [template-variable]').each(function(index, element) {
var value = null; var value = null;
switch(element.getAttribute('template-type')) { switch (element.getAttribute('template-type')) {
case 'boolean': case 'boolean':
value = (element.value === 'true' || element.value === '1') ? true : false; value = (element.value === 'true' || element.value === '1') ? true : false;
break; break;
case 'int': // Intentional fall-through case 'int': // Intentional fall-through
case 'integer': case 'integer':
value = parseInt(element.value); value = parseInt(element.value);
break; break;
default: default:
value = element.value; value = element.value;
break; break;
} }
templates.set(element.getAttribute('template-variable'), value); templates.set(element.getAttribute('template-variable'), value);
@ -252,7 +250,8 @@
return template.replace(regex, block); return template.replace(regex, block);
} }
var template = this.html, regex, block; var template = this.html,
regex, block;
return (function parse(data, namespace, template) { return (function parse(data, namespace, template) {
if (!data || data.length == 0) { if (!data || data.length == 0) {
@ -267,14 +266,16 @@
namespace += d + '.'; namespace += d + '.';
var regex = makeRegex(d), var regex = makeRegex(d),
block = getBlock(regex, namespace.substring(0, namespace.length-1), template); block = getBlock(regex, namespace.substring(0, namespace.length - 1), template);
if (block == null) { if (block == null) {
namespace = namespace.replace(d + '.', ''); namespace = namespace.replace(d + '.', '');
continue; continue;
} }
var numblocks = data[d].length - 1, i = 0, result = ""; var numblocks = data[d].length - 1,
i = 0,
result = "";
do { do {
result += parse(data[d][i], namespace, block); result += parse(data[d][i], namespace, block);
@ -312,7 +313,8 @@
templates.init(); templates.init();
} }
})('undefined' === typeof module ? {module:{exports:{}}} : module) })('undefined' === typeof module ? {
module: {
exports: {}
}
} : module)

56
public/src/utils.js
Unescape Escape View File

@ -1,4 +1,4 @@
(function (module) { (function(module) {
var utils, fs; var utils, fs;
@ -10,7 +10,8 @@
module.exports = utils = { module.exports = utils = {
generateUUID: function() { generateUUID: function() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8); var r = Math.random() * 16 | 0,
v = c == 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16); return v.toString(16);
}); });
}, },
@ -43,7 +44,7 @@
}, },
relativeTime: function(timestamp, min) { relativeTime: function(timestamp, min) {
var now = +new Date(), var now = +new Date(),
difference = now - Math.floor(parseFloat(timestamp)); difference = now - Math.floor(parseFloat(timestamp));
difference = Math.floor(difference / 1000); difference = Math.floor(difference / 1000);
@ -73,14 +74,14 @@
// remove accents, swap ñ for n, etc // remove accents, swap ñ for n, etc
var from = "àáäâèéëêìíïîıòóöôùúüûñçşğ·/_,:;"; var from = "àáäâèéëêìíïîıòóöôùúüûñçşğ·/_,:;";
var to = "aaaaeeeeiiiiioooouuuuncsg------"; var to = "aaaaeeeeiiiiioooouuuuncsg------";
for (var i=0, l=from.length ; i<l ; i++) { for (var i = 0, l = from.length; i < l; i++) {
str = str.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i)); str = str.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i));
} }
str = str.replace(/[^a-z0-9 -]/g, '') // remove invalid chars str = str.replace(/[^a-z0-9 -]/g, '') // remove invalid chars
.replace(/\s+/g, '-') // collapse whitespace and replace by - .replace(/\s+/g, '-') // collapse whitespace and replace by -
.replace(/-+/g, '-'); // collapse dashes .replace(/-+/g, '-'); // collapse dashes
return str; return str;
}, },
@ -103,21 +104,21 @@
// Blatently stolen from: http://phpjs.org/functions/strip_tags/ // Blatently stolen from: http://phpjs.org/functions/strip_tags/
'strip_tags': function(input, allowed) { 'strip_tags': function(input, allowed) {
allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>) allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi; commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) { return input.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''; return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
}); });
}, },
buildMetaTags: function(tagsArr) { buildMetaTags: function(tagsArr) {
var tags = '', var tags = '',
tag; tag;
for(var x=0,numTags=tagsArr.length;x<numTags;x++) { for (var x = 0, numTags = tagsArr.length; x < numTags; x++) {
if (tags.length > 0) tags += "\n\t"; if (tags.length > 0) tags += "\n\t";
tag = '<meta'; tag = '<meta';
for(y in tagsArr[x]) { for (y in tagsArr[x]) {
tag += ' ' + y + '="' + tagsArr[x][y] + '"'; tag += ' ' + y + '="' + tagsArr[x][y] + '"';
} }
tag += ' />'; tag += ' />';
@ -130,14 +131,14 @@
refreshTitle: function(url) { refreshTitle: function(url) {
if (!url) { if (!url) {
var a = document.createElement('a'); var a = document.createElement('a');
a.href = document.location; a.href = document.location;
url = a.pathname.slice(1); url = a.pathname.slice(1);
} }
var notificationIcon; var notificationIcon;
socket.emit('api:meta.buildTitle', url, function(title, numNotifications) { socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title; document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
notificationIcon = notificationIcon || document.querySelector('.notifications a i'); notificationIcon = notificationIcon || document.querySelector('.notifications a i');
if (numNotifications > 0 && notificationIcon) notificationIcon.className = 'icon-circle active'; if (numNotifications > 0 && notificationIcon) notificationIcon.className = 'icon-circle active';
}); });
@ -150,8 +151,7 @@
badge badge
.removeClass('badge-inverse') .removeClass('badge-inverse')
.addClass('badge-important') .addClass('badge-important')
} } else {
else {
badge badge
.removeClass('badge-important') .removeClass('badge-important')
.addClass('badge-inverse') .addClass('badge-inverse')
@ -160,26 +160,34 @@
}, },
isRelativeUrl: function(url) { isRelativeUrl: function(url) {
var firstChar = url.slice(0, 1); var firstChar = url.slice(0, 1);
return (firstChar === '.' || firstChar === '/'); return (firstChar === '.' || firstChar === '/');
} }
} }
if (!String.prototype.trim) { if (!String.prototype.trim) {
String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g, '');}; String.prototype.trim = function() {
return this.replace(/^\s+|\s+$/g, '');
};
} }
if (!String.prototype.ltrim) { if (!String.prototype.ltrim) {
String.prototype.ltrim=function(){return this.replace(/^\s+/,'');}; String.prototype.ltrim = function() {
return this.replace(/^\s+/, '');
};
} }
if (!String.prototype.rtrim) { if (!String.prototype.rtrim) {
String.prototype.rtrim=function(){return this.replace(/\s+$/,'');}; String.prototype.rtrim = function() {
return this.replace(/\s+$/, '');
};
} }
if (!String.prototype.fulltrim) { if (!String.prototype.fulltrim) {
String.prototype.fulltrim=function(){return this.replace(/(?:(?:^|\n)\s+|\s+(?:$|\n))/g,'').replace(/\s+/g,' ');}; String.prototype.fulltrim = function() {
return this.replace(/(?:(?:^|\n)\s+|\s+(?:$|\n))/g, '').replace(/\s+/g, ' ');
};
} }
@ -187,4 +195,8 @@
window.utils = module.exports; window.utils = module.exports;
} }
})('undefined' === typeof module ? {module:{exports:{}}} : module) })('undefined' === typeof module ? {
module: {
exports: {}
}
} : module)
Write Preview
Loading…
Cancel
Save