taler-typescript-core

commit 1c5cb3819718a15523b39f532ff70994eded051f
parent f5d359e7025c6c5ac94b730b145afa9494033833
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Wed, 16 Dec 2015 16:52:31 +0100

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

Conflicts:
	wallet_webextension/extension/background/emscriptif.js

Diffstat:
M
extension/background/emscriptif.js
 | 
2
+-
M
extension/background/emscriptif.ts
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extension/background/emscriptif.js b/extension/background/emscriptif.js
@@ -363,7 +363,7 @@ class SignatureStruct {
     constructor(x) {
         this.members = {};
         for (let k in x) {
-            this.set(x, x[k]);
+            this.set(k, x[k]);
         }
     }
     toPurpose(a) {
diff --git 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]);
     }
   }