Merge branch 'master' of https://github.com/borisyankov/DefinitelyTyped

d3/d3.d.ts

@@ -2442,6 +2442,7 @@ declare module D3 {
                 (values: any[]): Scale;
                 (): any[];
             };
+            invertExtent(y: any): any[];
             copy(): Scale;
         }
 

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() {

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;

openlayers/openlayers.d.ts

@@ -611,7 +611,7 @@ declare module OpenLayers {
          * openlayers.org homepage:
          * http://trac.openlayers.org/wiki/SettingZoomLevels
          */
-        private initResolutions(): void;
+        initResolutions(): void;
 
         /**
          * Method: resolutionsFromScales
@@ -635,7 +635,7 @@ declare module OpenLayers {
          * Returns:
          * {Array({Number})} Array of resolutions.
          */
-        private calculateResolutions(props: Object): number[];
+        calculateResolutions(props: Object): number[];
 
         /**
          * APIMethod: getResolution
@@ -760,7 +760,7 @@ declare module OpenLayers {
          * Returns:
          * {Integer} the z-index of this layer
          */
-        private getZIndex(): number;
+        getZIndex(): number;
 
         /**
          * Method: setZIndex
@@ -768,7 +768,7 @@ declare module OpenLayers {
          * Parameters:
          * zIndex - {Integer}
          */
-        private setZIndex(zIndex: number): void;
+        setZIndex(zIndex: number): void;
 
         /**
          * Method: adjustBounds
@@ -781,7 +781,7 @@ declare module OpenLayers {
          * Parameters:
          * bounds - {<OpenLayers.Bounds>}
          */
-        private adjustBounds(bounds: Bounds): Bounds;
+        adjustBounds(bounds: Bounds): Bounds;
 
         static CLASS_NAME: string;
     }