From b9873f2071c017712adfe4b58d31fa38f8872bdc Mon Sep 17 00:00:00 2001
From: malaporte <mlaporte@coveo.com>
Date: Tue, 25 Feb 2014 17:23:07 +0100
Subject: [PATCH] Added string overloads as well as support for innerWidth and
 innerHeight.

---
 jquery/jquery-tests.ts |  8 +++++++
 jquery/jquery.d.ts     | 52 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts
index 6be06e1eb..06f19801d 100644
--- a/jquery/jquery-tests.ts
+++ b/jquery/jquery-tests.ts
@@ -2166,11 +2166,17 @@ function test_index() {
 function test_innerHeight() {
     var p = $("p:first");
     $("p:last").text("innerHeight:" + p.innerHeight());
+
+    p.innerHeight(123);
+    p.innerHeight('123px');
 }
 
 function test_innerWidth() {
     var p = $("p:first");
     $("p:last").text("innerWidth:" + p.innerWidth());
+
+    p.innerWidth(123);
+    p.innerWidth('123px');
 }
 
 function test_outerHeight() {
@@ -2180,6 +2186,7 @@ function test_outerHeight() {
         " , outerHeight( true ):" + p.outerHeight(true));
 
     p.outerHeight(123);
+    p.outerHeight('123px');
 }
 
 function test_outerWidth() {
@@ -2189,6 +2196,7 @@ function test_outerWidth() {
         " , outerWidth( true ):" + p.outerWidth(true));
 
     p.outerWidth(123);
+    p.outerWidth('123px');
 }
 
 function test_scrollLeft() {
diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index 5add44d2e..958128e2c 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -1418,11 +1418,39 @@ interface JQuery {
      */
     innerHeight(): number;
 
+    /**
+     * Sets the inner height on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerHeight(height: number): JQuery;
+
+    /**
+     * Sets the inner height on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerHeight(height: string): JQuery;
+
     /**
      * Get the current computed width for the first element in the set of matched elements, including padding but not border.
      */
     innerWidth(): number;
 
+    /**
+     * Sets the inner width on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerWidth(width: number): JQuery;
+
+    /**
+     * Sets the inner width on elements in the set of matched elements, including padding but not border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    innerWidth(width: string): JQuery;
+
     /**
      * Get the current coordinates of the first element in the set of matched elements, relative to the document.
      */
@@ -1454,6 +1482,13 @@ interface JQuery {
      */
     outerHeight(height: number): JQuery;
 
+    /**
+     * Sets the outer height on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    outerHeight(height: string): JQuery;
+
     /**
      * Get the current computed width for the first element in the set of matched elements, including padding and border.
      *
@@ -1461,13 +1496,20 @@ interface JQuery {
      */
     outerWidth(includeMargin?: boolean): number;
 
-  /**
-   * Sets the outer width on elements in the set of matched elements, including padding and border.
-   *
-   * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
-   */
+    /**
+     * Sets the outer width on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
     outerWidth(width: number): JQuery;
 
+    /**
+     * Sets the outer width on elements in the set of matched elements, including padding and border.
+     *
+     * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string).
+     */
+    outerWidth(width: string): JQuery;
+
     /**
      * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
      */