From 6b72968ffbf38d54675d22c857c66d581c372f83 Mon Sep 17 00:00:00 2001
From: Emil Ekberg <ekberg.emil@gmail.com>
Date: Sun, 19 Jul 2015 15:36:23 +0200
Subject: [PATCH] Added test cases

---
 webfontloader/webfontloader-tests.ts           | 18 ++++++++++++++++++
 webfontloader/webfontloader-tests.ts.tscparams |  1 +
 webfontloader/webfontloader.d.ts               | 14 +++++++-------
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 webfontloader/webfontloader-tests.ts
 create mode 100644 webfontloader/webfontloader-tests.ts.tscparams

diff --git a/webfontloader/webfontloader-tests.ts b/webfontloader/webfontloader-tests.ts
new file mode 100644
index 000000000..5f27ea959
--- /dev/null
+++ b/webfontloader/webfontloader-tests.ts
@@ -0,0 +1,18 @@
+/// <reference path="webfontloader" />
+import webfontloader = require("webfontloader");
+
+var config: webfontloader.Config = {
+	classes: false,
+	events: false,
+	loading: function() {},
+  	active: function() {},
+  	inactive: function() {},
+  	fontloading: function(familyName:string, fvd:string) {},
+  	fontactive: function(familyName:string, fvd:string) {},
+  	fontinactive: function(familyName:string, fvd:string) {},
+  	google: {
+    	families: ['Droid Sans']
+  	},
+  	timeout: 2000
+}
+webfontloader.load(config);
\ No newline at end of file
diff --git a/webfontloader/webfontloader-tests.ts.tscparams b/webfontloader/webfontloader-tests.ts.tscparams
new file mode 100644
index 000000000..4169d3605
--- /dev/null
+++ b/webfontloader/webfontloader-tests.ts.tscparams
@@ -0,0 +1 @@
+--noImplicitAny --module commonjs --target es5
\ No newline at end of file
diff --git a/webfontloader/webfontloader.d.ts b/webfontloader/webfontloader.d.ts
index d8e354cf7..6da62cf07 100644
--- a/webfontloader/webfontloader.d.ts
+++ b/webfontloader/webfontloader.d.ts
@@ -3,10 +3,8 @@
 // Definitions by: doskallemaskin <https://github.com/doskallemaskin/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare class WebFont {
-	static load(config:WebFont.Config);
-}
 declare module WebFont {
+	export function load(config:WebFont.Config):void;
 	export interface Config {
 		/** Setting this to false will disable html classes (defaults to true) */
 		classes?:boolean;
@@ -21,11 +19,11 @@ declare module WebFont {
 		/** This event is triggered when the browser does not support linked fonts or if none of the fonts could be loaded. */
 		inactive?():void;
 		/** This event is triggered once for each font that's loaded. */
-		fontloading?(familyName: string, fvd):void;
+		fontloading?(familyName:string, fvd:string):void;
 		/** This event is triggered once for each font that renders. */
-		fontactive?(familyName: string, fvd):void;
+		fontactive?(familyName:string, fvd:string):void;
 		/** This event is triggered if the font can't be loaded. */
-		fontinactive?(familyName: string, fvd):void;
+		fontinactive?(familyName:string, fvd:string):void;
 		
 		/** Child window or iframes to manage fonts for */
 		context?:Array<string>;
@@ -46,7 +44,6 @@ declare module WebFont {
 		families?:Array<string>;
 		urls?:Array<string>;
 		testStrings?:{[fontFamily:string]:string};
-		
 	}
 	export interface Fontdeck {
 		id?:string;
@@ -56,4 +53,7 @@ declare module WebFont {
 		version?:number;
 	}
 	
+}
+declare module "webfontloader" {
+    export = WebFont;
 }
\ No newline at end of file