From 0c8b8219167d47b6e1e5bb47abdb054f3000ef58 Mon Sep 17 00:00:00 2001 From: Kohei Hisakuni Date: Sat, 13 Feb 2016 12:53:18 -0800 Subject: [PATCH 1/2] Make sure vexflow can be loaded with jspm --- vexflow/vexflow.d.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vexflow/vexflow.d.ts b/vexflow/vexflow.d.ts index 5c304fa307..fd41619ef5 100644 --- a/vexflow/vexflow.d.ts +++ b/vexflow/vexflow.d.ts @@ -6,7 +6,7 @@ //inconsistent namespace: this is a helper funtion from tables.js and should not pollute the global namespace! declare function sanitizeDuration(duration : string) : string; -declare namespace Vex { +declare module Vex { function L(block : string, args : any[]) : void; function Merge(destination : T, source : Object) : T; @@ -1411,3 +1411,7 @@ declare namespace Vex { } } } + +declare module "vexflow" { + export = Vex; +} From 220e6719ea9efc8b0325303bd8c55575084ae471 Mon Sep 17 00:00:00 2001 From: Kohei Hisakuni Date: Wed, 17 Feb 2016 07:25:16 -0800 Subject: [PATCH 2/2] Change module back to namespace --- vexflow/vexflow.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vexflow/vexflow.d.ts b/vexflow/vexflow.d.ts index fd41619ef5..9f5a8a0065 100644 --- a/vexflow/vexflow.d.ts +++ b/vexflow/vexflow.d.ts @@ -6,7 +6,7 @@ //inconsistent namespace: this is a helper funtion from tables.js and should not pollute the global namespace! declare function sanitizeDuration(duration : string) : string; -declare module Vex { +declare namespace Vex { function L(block : string, args : any[]) : void; function Merge(destination : T, source : Object) : T;