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

This commit is contained in:
psychobunny
2014-03-04 14:53:31 -05:00
21 changed files with 24 additions and 3 deletions

View File

@@ -231,8 +231,10 @@ var socket,
}
if (typeof params.clickfn === 'function') {
alert.on('click', function () {
params.clickfn();
alert.on('click', function (e) {
if(!$(e.target).is('.close')) {
params.clickfn();
}
fadeOut();
});
}