Mirrors/send
1
0
Fork 0
mirror of https://gitlab.com/timvisee/send.git synced 2025-12-07 22:50:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'vnext' into modal

Browse Source
This commit is contained in:
Danny Coates
2018-09-14 09:20:30 -07:00
committed by GitHub
parent cdc15596df 7ccf462bf8
commit bf83b43866
18 changed files with 331 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/fileManager.js
View File

@@ -5,7 +5,6 @@ import { copyToClipboard, delay, openLinksInNewTab, percent } from './utils';
import * as metrics from './metrics';
import Archive from './archive';
import { bytes } from './utils';
import { prepareWrapKey } from './fxa';
import okDialog from './templates/okDialog';
export default function(state, emitter) {
@@ -46,9 +45,8 @@ export default function(state, emitter) {
lastRender = Date.now();
});
emitter.on('login', async () => {
const k = await prepareWrapKey(state.storage);
location.assign(`/api/fxa/login?keys_jwk=${k}`);
emitter.on('login', () => {
state.user.login();
});
emitter.on('logout', () => {