taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Merge branch 'master' of ssh://taler.net/var/git/wallet

Browse Source 
Conflicts:
	wallet_webextension/extension/background/emscriptif.js
This commit is contained in:
Marcello Stanisci 2015-12-16 16:52:31 +01:00
commit 1c5cb38197
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extension/background/emscriptif.js
View File

@ -363,7 +363,7 @@ class SignatureStruct {
constructor(x) { constructor(x) {
this.members = {}; this.members = {};
for (let k in x) { for (let k in x) {
this.set(x, x[k]); this.set(k, x[k]);
} }
} }
toPurpose(a) { toPurpose(a) {

4
extension/background/emscriptif.ts
View File

@ -517,9 +517,9 @@ abstract class SignatureStruct {
abstract purpose(): SignaturePurpose; abstract purpose(): SignaturePurpose;
private members: any = {}; private members: any = {};
constructor(x: any) { constructor(x: { [name: string]: any }) {
for (let k in x) { for (let k in x) {
this.set(x, x[k]); this.set(k, x[k]);
} }
} }