Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
This commit is contained in:
Julian Lam
2015-10-25 07:33:59 -04:00
parent 167ba64018 a739ad81ab
commit b52475c270
112 changed files with 1769 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/src/modules/helpers.js
View File

@@ -10,8 +10,11 @@
var helpers = {};
helpers.displayMenuItem = function(data, index) {
var item = data.navigation[index],
properties = item.properties;
var item = data.navigation[index];
if (!item) {
return false;
}
var properties = item.properties;
if (properties) {
if ((properties.loggedIn && !data.config.loggedIn) ||
@@ -37,7 +40,7 @@
property = tag.property ? 'property="' + tag.property + '" ' : '',
content = tag.content ? 'content="' + tag.content.replace(/\n/g, ' ') + '" ' : '';
return '<meta ' + name + property + content + '/>';
return '<meta ' + name + property + content + '/>\n\t';
};
helpers.buildLinkTag = function(tag) {
@@ -47,7 +50,7 @@
href = tag.href ? 'href="' + tag.href + '" ' : '',
sizes = tag.sizes ? 'sizes="' + tag.sizes + '" ' : '';
return '<link ' + link + rel + type + sizes + href + '/>';
return '<link ' + link + rel + type + sizes + href + '/>\n\t';
};
helpers.stringify = function(obj) {