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

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Browse Source
This commit is contained in:
psychobunny
2014-02-28 16:42:05 -05:00
parent 4b2f5cbfab 9069f9aedc
commit e73f8d6f37
8 changed files with 94 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/app.js
View File

@@ -218,9 +218,10 @@ var socket,
$('#' + params.location).prepend(alert.fadeIn('100'));
if(typeof params.closefn === 'function') {
alert.find('button').on('click', function () {
alert.find('button').on('click', function() {
params.closefn();
fadeOut();
return false;
});
}
});
@@ -407,7 +408,7 @@ var socket,
return;
}
if (!app.username) {
if (!app.uid) {
app.alert({
type: 'danger',
title: 'Not Logged In',