web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lint compliance

Browse Source
This commit is contained in:
yflory
2017-11-09 17:23:13 +01:00
parent cf5ccf04f2
commit f931574dac
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/settings/main.js
View File

@@ -60,7 +60,7 @@ define([
var sjson = JSON.stringify(data);
var k = Cryptpad.getUserHash() || localStorage[Cryptpad.fileHashKey];
require(['/common/cryptget.js'], function (Crypt) {
Crypt.put(k, sjson, function (err, data) {
Crypt.put(k, sjson, function (err) {
cb(err);
});
});
@@ -80,7 +80,10 @@ define([
Cryptpad.whenRealtimeSyncs(realtime, cb);
});
sframeChan.on('Q_SETTINGS_IMPORT_LOCAL', function (data, cb) {
Merge.anonDriveIntoUser(Cryptpad.getStore().getProxy(), localStorage.FS_hash, cb);
var proxyData = Cryptpad.getStore().getProxy();
require(['/common/mergeDrive.js'], function (Merge) {
Merge.anonDriveIntoUser(proxyData, localStorage.FS_hash, cb);
});
});
};
SFCommonO.start({