mirror of
https://github.com/keeweb/keeweb.git
synced 2024-06-25 07:37:46 +02:00
fix import
This commit is contained in:
parent
6729754049
commit
d7542a44c6
|
@ -83,7 +83,7 @@ var FileModel = Backbone.Model.extend({
|
||||||
var ts = logger.ts();
|
var ts = logger.ts();
|
||||||
var password = kdbxweb.ProtectedValue.fromString('');
|
var password = kdbxweb.ProtectedValue.fromString('');
|
||||||
var credentials = new kdbxweb.Credentials(password);
|
var credentials = new kdbxweb.Credentials(password);
|
||||||
kdbxweb.Kdbx.import(fileXml, credentials, (function(db, err) {
|
kdbxweb.Kdbx.loadXml(fileXml, credentials, (function(db, err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
logger.error('Error importing file', err.code, err.message, err);
|
logger.error('Error importing file', err.code, err.message, err);
|
||||||
callback(err);
|
callback(err);
|
||||||
|
@ -91,8 +91,7 @@ var FileModel = Backbone.Model.extend({
|
||||||
this.db = db;
|
this.db = db;
|
||||||
this.readModel();
|
this.readModel();
|
||||||
this.set({ open: true, created: true });
|
this.set({ open: true, created: true });
|
||||||
logger.info('Imported file ' + this.get('name') + ': ' + logger.ts(ts) + ', ' +
|
logger.info('Imported file ' + this.get('name') + ': ' + logger.ts(ts));
|
||||||
Math.round(fileXml.byteLength / 1024) + ' kB');
|
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
}).bind(this));
|
}).bind(this));
|
||||||
|
|
|
@ -158,7 +158,11 @@ var OpenView = Backbone.View.extend({
|
||||||
complete(false);
|
complete(false);
|
||||||
}
|
}
|
||||||
}).bind(this);
|
}).bind(this);
|
||||||
reader.readAsArrayBuffer(file);
|
if (this.reading === 'fileXml') {
|
||||||
|
reader.readAsText(file);
|
||||||
|
} else {
|
||||||
|
reader.readAsArrayBuffer(file);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
displayOpenFile: function() {
|
displayOpenFile: function() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user