keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix #628: merge errors

This commit is contained in:
antelle 2017-05-17 20:32:46 +02:00
parent a006b0f5fc
commit 49bfcc6994
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/models/file-model.js
View File

@ -246,7 +246,7 @@ const FileModel = Backbone.Model.extend({
credentials.keyFileHash = this.db.credentials.keyFileHash;
}
}
credentialsPromise = Promise.all(promises);
return Promise.all(promises);
});
} else {
credentials = this.db.credentials;

2
app/scripts/views/key-change-view.js
View File

@ -97,7 +97,7 @@ const KeyChangeView = Backbone.View.extend({
InputFx.shake(this.passwordInput.el);
return;
} else {
this.passwordRepeatInput.el.removeClass('input--error');
this.passwordInput.el.removeClass('input--error');
}
if (this.passwordRepeatInput) {
if (!this.passwordRepeatInput.value.equals(this.passwordInput.value)) {