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

fix import

This commit is contained in:
exromany 2016-03-02 01:17:19 +04:00
parent 6729754049
commit d7542a44c6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ var FileModel = Backbone.Model.extend({
var ts = logger.ts();
var password = kdbxweb.ProtectedValue.fromString('');
var credentials = new kdbxweb.Credentials(password);
kdbxweb.Kdbx.import(fileXml, credentials, (function(db, err) {
kdbxweb.Kdbx.loadXml(fileXml, credentials, (function(db, err) {
if (err) {
logger.error('Error importing file', err.code, err.message, err);
callback(err);
@ -91,8 +91,7 @@ var FileModel = Backbone.Model.extend({
this.db = db;
this.readModel();
this.set({ open: true, created: true });
logger.info('Imported file ' + this.get('name') + ': ' + logger.ts(ts) + ', ' +
Math.round(fileXml.byteLength / 1024) + ' kB');
logger.info('Imported file ' + this.get('name') + ': ' + logger.ts(ts));
callback();
}
}).bind(this));

6
app/scripts/views/open-view.js
View File

@ -158,7 +158,11 @@ var OpenView = Backbone.View.extend({
complete(false);
}
}).bind(this);
reader.readAsArrayBuffer(file);
if (this.reading === 'fileXml') {
reader.readAsText(file);
} else {
reader.readAsArrayBuffer(file);
}
},
displayOpenFile: function() {