summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-03-17 19:20:32 +0000
committerJohn McLear <john@mclear.co.uk>2014-03-17 19:20:32 +0000
commite1fa43e640bfaa1e9102897d38442a705f7ce827 (patch)
tree8ae02602dad84258d46635b403d94c84447b936b /src
parent8cd9b98b767a8bcf938e3314bb609ce85d6e1437 (diff)
downloadetherpad-lite-e1fa43e640bfaa1e9102897d38442a705f7ce827.zip
quick formatting clean up
Diffstat (limited to 'src')
-rw-r--r--src/node/hooks/express/webaccess.js2
-rw-r--r--src/static/js/pad.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index 433d5094..6998853f 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -41,7 +41,7 @@ exports.basicAuth = function (req, res, next) {
req.session.user = settings.users[username];
return cb(true);
}
- return hooks.aCallFirst("authenticate", {req: req, res:res, next:next, username: username, password: password}, hookResultMangle(cb));
+ return hooks.aCallFirst("authenticate", {req: req, res:res, next:next, username: username, password: password}, hookResultMangle(cb));
}
hooks.aCallFirst("authenticate", {req: req, res:res, next:next}, hookResultMangle(cb));
}
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index cca2f3eb..73fcd3d6 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -254,8 +254,9 @@ function handshake()
//the access was not granted, give the user a message
if(obj.accessStatus)
{
- if(!receivedClientVars)
+ if(!receivedClientVars){
$('.passForm').submit(require(module.id).savePassword);
+ }
if(obj.accessStatus == "deny")
{