From 40adcdd3adf8d61d3fee48fd435e2e52285ccc27 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Thu, 9 Jan 2014 13:35:13 +0000 Subject: [PATCH] jQuery: offsetWidth, offsetHeight, position JSDoc removed invalid overloads, added JSDoc, changed position to use JQueryCoordinates. Added position test suite. --- jquery/jquery-tests.ts | 18 ++++++++++++------ jquery/jquery.d.ts | 17 ++++++++++++++--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts index e8b11f182..35a954e95 100644 --- a/jquery/jquery-tests.ts +++ b/jquery/jquery-tests.ts @@ -1802,16 +1802,22 @@ function test_innerWidth() { function test_outerHeight() { var p = $("p:first"); - $("p:last").text("outerHeight:" + p.outerHeight(true)); - p.outerHeight(p.outerHeight() * 2).outerHeight(); - p.outerHeight(p.outerHeight() * 2, true).outerHeight(); + $("p:last").text( + "outerHeight:" + p.outerHeight() + + " , outerHeight( true ):" + p.outerHeight(true)); } function test_outerWidth() { var p = $("p:first"); - $("p:last").text("outerWidth:" + p.outerWidth(true)); - p.outerWidth(p.outerWidth() * 2).outerWidth(); - p.outerWidth(p.outerWidth() * 2, true).outerWidth(); + $("p:last").text( + "outerWidth:" + p.outerWidth() + + " , outerWidth( true ):" + p.outerWidth(true)); +} + +function test_position() { + var p = $("p:first"); + var position = p.position(); + $("p:last").text("left: " + position.left + ", top: " + position.top); } function test_insertAfter() { diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts index e0018f654..01e75e118 100644 --- a/jquery/jquery.d.ts +++ b/jquery/jquery.d.ts @@ -1048,13 +1048,24 @@ interface JQuery { */ offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery; + /** + * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements. + * + * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation. + */ outerHeight(includeMargin?: boolean): number; - outerHeight(value: number, includeMargin?: boolean): JQuery; + /** + * Get the current computed width for the first element in the set of matched elements, including padding and border. + * + * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation. + */ outerWidth(includeMargin?: boolean): number; - outerWidth(value: number, includeMargin?: boolean): JQuery; - position(): { top: number; left: number; }; + /** + * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent. + */ + position(): JQueryCoordinates; scrollLeft(): number; scrollLeft(value: number): JQuery;