diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-12-16 16:52:31 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-12-16 16:52:31 +0100 |
| commit | 1c5cb3819718a15523b39f532ff70994eded051f (patch) | |
| tree | 83fedac71195c7ddc9bfe1d1075b4d1e235b4b0e /extension/background/emscriptif.ts | |
| parent | f5d359e7025c6c5ac94b730b145afa9494033833 (diff) | |
| parent | a9f3d077f9e53fe80bb78aca0531fbd2c14aae36 (diff) | |
Merge branch 'master' of ssh://taler.net/var/git/wallet
Conflicts:
wallet_webextension/extension/background/emscriptif.js
Diffstat (limited to 'extension/background/emscriptif.ts')
| -rw-r--r-- | extension/background/emscriptif.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extension/background/emscriptif.ts b/extension/background/emscriptif.ts index bf2f43c9b..150b68741 100644 --- a/extension/background/emscriptif.ts +++ b/extension/background/emscriptif.ts @@ -517,9 +517,9 @@ abstract class SignatureStruct { abstract purpose(): SignaturePurpose; private members: any = {}; - constructor(x: any) { + constructor(x: { [name: string]: any }) { for (let k in x) { - this.set(x, x[k]); + this.set(k, x[k]); } } |