clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-25 17:47:34 +02:00
Code Issues Releases Wiki Activity

Fixed lock/unlock issue and removed console.log

Browse Source
This commit is contained in:
Giulio Cesare Solaroli
2015-10-27 14:31:39 +01:00
parent e3c386497f
commit 8608fb4253
6 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/delta/js/Clipperz/PM/UI/Components/Cards/TextArea.js
View File

@@ -63,7 +63,6 @@ Clipperz.PM.UI.Components.Cards.TextAreaClass = React.createClass({
handleKeyDown: function (anEvent) {
switch (anEvent.keyCode) {
case 27: // escape
console.log("ESCAPE");
Mousetrap.trigger('esc');
break;
}

16
frontend/delta/js/Clipperz/PM/UI/MainController.js
View File

@@ -424,19 +424,27 @@ Clipperz.log("THE BROWSER IS OFFLINE");
unlock_handler: function(aCredential, aCredentialType) {
var deferredResult;
var passphrase;
var user, passphrase, getPassphraseDelegate;
var user = this.user();
// var user = this.user();
var oldUser = this.user();
var unlockPage = this.pages()['unlockPage'];
var overlay = this.overlay();
overlay.show("validating…");
passphrase = (aCredentialType=='PIN') ? Clipperz.PM.PIN.credentialsWithPIN(aCredential)['passphrase'] : aCredential;
deferredResult = new Clipperz.Async.Deferred('MainController.unlock_handler', {trace:false});
getPassphraseDelegate = MochiKit.Base.partial(MochiKit.Async.succeed, passphrase);
user = new Clipperz.PM.DataModel.User({'username':oldUser.username(), 'getPassphraseFunction':getPassphraseDelegate});
deferredResult = new Clipperz.Async.Deferred('MainController.unlock_handler', {trace:true});
deferredResult.addMethod(unlockPage, 'setProps', {'disabled': true});
deferredResult.addMethod(user, 'unlock', function() { return MochiKit.Async.succeed(passphrase); });
deferredResult.addMethod(user, 'login');
deferredResult.addMethod(this, 'setUser', user);
// deferredResult.addMethod(user, 'unlock', MochiKit.Base.partial(MochiKit.Async.succeed, passphrase));
deferredResult.addErrback(MochiKit.Base.bind(function (aValue) {
var innerDeferredResult;
var errorMessage;