From 9439dc4ab093788829067802c0fdff0e21fbce70 Mon Sep 17 00:00:00 2001
From: Nathan Pitman <pitmannathan@gmail.com>
Date: Tue, 12 May 2015 17:07:03 +1200
Subject: [PATCH] Fixed nullability in qtip2.d.ts. Fixed style tests in
 qtip2-tests.ts

---
 qtip2/qtip2-tests.ts | 8 ++++----
 qtip2/qtip2.d.ts     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qtip2/qtip2-tests.ts b/qtip2/qtip2-tests.ts
index ea4e16099b..144b4aa51d 100644
--- a/qtip2/qtip2-tests.ts
+++ b/qtip2/qtip2-tests.ts
@@ -398,7 +398,7 @@ function testStyleProperty() {
 	});
 
 	$a.qtip({
-		show: {
+		style: {
 			classes: false,
 			width: 24,
 			height: 24,
@@ -407,7 +407,7 @@ function testStyleProperty() {
 	});
 
 	$a.qtip({
-		show: {
+		style: {
 			classes: false,
 			width: false,
 			height: false,
@@ -423,7 +423,7 @@ function testStyleProperty() {
 	});
 
 	$a.qtip({
-		show: {
+		style: {
 			tip: {
 				corner: true,
 				mimic: true,
@@ -433,7 +433,7 @@ function testStyleProperty() {
 	});
 
 	$a.qtip({
-		show: {
+		style: {
 			tip: { }
 		}
 	});
diff --git a/qtip2/qtip2.d.ts b/qtip2/qtip2.d.ts
index 1691715b63..8d17544f1d 100644
--- a/qtip2/qtip2.d.ts
+++ b/qtip2/qtip2.d.ts
@@ -98,8 +98,8 @@ declare module QTip2 {
 		classes?: string | boolean;
 		def?: boolean;
 		widget?: boolean;
-		width: string | number | boolean;
-		height: string | number | boolean;
+		width?: string | number | boolean;
+		height?: string | number | boolean;
 		tip?: string | boolean | Tip;
 	}