Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
This commit is contained in:
Julian Lam
2015-10-07 02:14:03 -04:00
parent 896abb59d3 8b3f1684f7
commit 4c96f95330
180 changed files with 1034 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/app.js
View File

@@ -159,8 +159,9 @@ app.cacheBuster = null;
}
}
app.createUserTooltips = function() {
$('img[title].teaser-pic,img[title].user-img,div.user-icon').each(function() {
app.createUserTooltips = function(els) {
els = els || $('body');
els.find('img[title].teaser-pic,img[title].user-img,div.user-icon').each(function() {
$(this).tooltip({
placement: 'top',
title: $(this).attr('title')