summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
authorGiulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-17 21:18:52 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-17 21:18:52 (UTC)
commit288b8df03a499a2e68ebaad48e687d1eac9df0ff (patch) (unidiff)
tree1fcaefffee8366b548465a05a6c4cba0c31e131d /frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
parent6f7ead0446aae6dd9f40b183e402b059a33d0517 (diff)
parent25029b943781850c76fbf43827af0204f35a98bf (diff)
downloadclipperz-288b8df03a499a2e68ebaad48e687d1eac9df0ff.zip
clipperz-288b8df03a499a2e68ebaad48e687d1eac9df0ff.tar.gz
clipperz-288b8df03a499a2e68ebaad48e687d1eac9df0ff.tar.bz2
Merge pull request #34 from gcsolaroli/master
Fixed some resources
Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js') (more/less context) (show whitespace changes)
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
index d0b378c..a57152d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
@@ -83,3 +83,2 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
83 varparameters; 83 varparameters;
84 // varshouldUseOTP;
85 var loginProgress; 84 var loginProgress;
@@ -89,3 +88,2 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
89 parameters = anEvent; 88 parameters = anEvent;
90 // shouldUseOTP = (typeof(parameters.passphrase) == 'undefined');
91 89
@@ -101,7 +99,3 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
101 deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection'); 99 deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection');
102 // if (shouldUseOTP == false) {
103 deferredResult.addMethod(user, 'login'); 100 deferredResult.addMethod(user, 'login');
104 // } else {
105 // deferredResult.addMethod(user, 'loginUsingOTP', parameters.username, parameters.otp);
106 // }
107 deferredResult.addCallback(function(aLoginProgress, res) { 101 deferredResult.addCallback(function(aLoginProgress, res) {