From 4c970c4251caff48bce8e66cd28e050903befaf6 Mon Sep 17 00:00:00 2001 From: Mike Van Sickle Date: Mon, 15 Dec 2014 14:41:18 -0500 Subject: [PATCH] Updated type definitions --- dojo/dijit.d.ts | 2 +- dojo/dojo.d.ts | 18 +++++++++--------- dojo/dojox.layout.d.ts | 33 +++++++++++++++++---------------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dojo/dijit.d.ts b/dojo/dijit.d.ts index f769cd44ff..45ab046fed 100644 --- a/dojo/dijit.d.ts +++ b/dojo/dijit.d.ts @@ -106,7 +106,7 @@ declare module dijit { * @param widget * @param insertIndex Optional */ - addChild(widget: dijit._WidgetBase, insertIndex: number): void; + addChild(widget: dijit._WidgetBase, insertIndex?: number): void; /** * */ diff --git a/dojo/dojo.d.ts b/dojo/dojo.d.ts index 07e57f13fd..8d9f268dcd 100644 --- a/dojo/dojo.d.ts +++ b/dojo/dojo.d.ts @@ -1817,7 +1817,7 @@ declare module dojo { /** * */ - "promise": Object; + "promise": dojo.promise.Promise; /** * Inform the deferred it may cancel its asynchronous operation. * Inform the deferred it may cancel its asynchronous operation. @@ -1874,7 +1874,7 @@ declare module dojo { * @param value The result of the deferred. Passed to callbacks. * @param strict OptionalIf strict, will throw an error if the deferred has alreadybeen fulfilled and consequently cannot be resolved. */ - resolve(value: any, strict: boolean): dojo.promise.Promise; + resolve(value: any, strict?: boolean): dojo.promise.Promise; /** * Add new callbacks to the deferred. * Add new callbacks to the deferred. Callbacks can be added @@ -16165,7 +16165,7 @@ declare module dojo { * @param errback OptionalCallback to be invoked when the promise is rejected.Receives the rejection error. * @param progback OptionalCallback to be invoked when the promise emits a progressupdate. Receives the progress update. */ - then(callback: Function, errback: Function, progback: Function): dojo.promise.Promise; + then(callback: Function, errback?: Function, progback?: Function): dojo.promise.Promise; /** * */ @@ -18077,7 +18077,7 @@ declare module dojo { * module for specifics. * */ - interface router { + interface router extends dojo.router.RouterBase { } module router { /** @@ -18119,7 +18119,7 @@ declare module dojo { * @param path * @param replace */ - go(path: any, replace: any): any; + go(path: string, replace?: boolean): any; /** * Registers a route to a handling callback * Given either a string or a regular expression, the router @@ -18548,7 +18548,7 @@ declare module dojo { * @param id A string to match an HTML id attribute or a reference to a DOM Node * @param doc OptionalDocument to work in. Defaults to the current value ofdojo/_base/window.doc. Can be used to retrievenode references from other documents. */ - byId(id: String, doc: HTMLDocument): any; + byId(id: String, doc?: HTMLDocument): any; /** * Returns DOM node with matching id attribute or falsy value (ex: null or undefined) * if not found. If id is a DomNode, this function is a no-op. @@ -18556,7 +18556,7 @@ declare module dojo { * @param id A string to match an HTML id attribute or a reference to a DOM Node * @param doc OptionalDocument to work in. Defaults to the current value ofdojo/_base/window.doc. Can be used to retrievenode references from other documents. */ - byId(id: HTMLElement, doc: HTMLDocument): any; + byId(id: HTMLElement, doc?: HTMLDocument): any; /** * Returns true if node is a descendant of ancestor * @@ -19604,7 +19604,7 @@ declare module dojo { * @param node * @param includeScroll Optional */ - position(node: HTMLElement, includeScroll: boolean): Object; + position(node: HTMLElement, includeScroll?: boolean): { w: number; h: number; x: number; y: number }; /** * Gets the position and size of the passed element relative to * the viewport (if includeScroll==false), or relative to the @@ -19620,7 +19620,7 @@ declare module dojo { * @param node * @param includeScroll Optional */ - position(node: String, includeScroll: boolean): Object; + position(node: String, includeScroll?: boolean): { w: number; h: number; x: number; y: number }; /** * Sets the size of the node's contents, irrespective of margins, * padding, or borders. diff --git a/dojo/dojox.layout.d.ts b/dojo/dojox.layout.d.ts index e7ba0b572a..fa03236d74 100644 --- a/dojo/dojox.layout.d.ts +++ b/dojo/dojox.layout.d.ts @@ -3913,6 +3913,7 @@ declare module dojox { set(property:"extractContent", value: boolean): void; get(property:"extractContent"): boolean; watch(property:"extractContent", callback:{(property?:string, oldValue?:boolean, newValue?: boolean):void}) :{unwatch():void} + focusNode: HTMLElement; /** * This widget or a widget it contains has focus, or is "active" because * it was recently clicked. @@ -4180,7 +4181,7 @@ declare module dojox { * @param widget * @param insertIndex Optional */ - addChild(widget: dijit._WidgetBase, insertIndex: number): void; + addChild(widget: dijit._WidgetBase, insertIndex? : number): void; /** * This method is deprecated, use get() or set() directly. * @@ -4688,7 +4689,7 @@ declare module dojox { * * @param callback Optional */ - show(callback: Function): void; + show(callback?: Function): void; /** * */ @@ -11443,31 +11444,31 @@ declare module "dojox/layout/RadioGroup" { export=exp; } declare module "dojox/layout/Dock" { - var exp: dojox.layout.Dock + var exp: typeof dojox.layout.Dock export=exp; } declare module "dojox/layout/DragPane" { - var exp: dojox.layout.DragPane + var exp: typeof dojox.layout.DragPane export=exp; } declare module "dojox/layout/ExpandoPane" { - var exp: dojox.layout.ExpandoPane + var exp: typeof dojox.layout.ExpandoPane export=exp; } declare module "dojox/layout/ContentPane" { - var exp: dojox.layout.ContentPane + var exp: typeof dojox.layout.ContentPane export=exp; } declare module "dojox/layout/GridContainer" { - var exp: dojox.layout.GridContainer + var exp: typeof dojox.layout.GridContainer export=exp; } declare module "dojox/layout/FloatingPane" { - var exp: dojox.layout.FloatingPane + var exp: typeof dojox.layout.FloatingPane export=exp; } declare module "dojox/layout/GridContainerLite" { - var exp: dojox.layout.GridContainerLite + var exp: typeof dojox.layout.GridContainerLite export=exp; } declare module "dojox/layout/GridContainerLite.ChildWidgetProperties" { @@ -11475,19 +11476,19 @@ declare module "dojox/layout/GridContainerLite.ChildWidgetProperties" { export=exp; } declare module "dojox/layout/ResizeHandle" { - var exp: dojox.layout.ResizeHandle + var exp: typeof dojox.layout.ResizeHandle export=exp; } declare module "dojox/layout/ToggleSplitter" { - var exp: dojox.layout.ToggleSplitter + var exp: typeof dojox.layout.ToggleSplitter export=exp; } declare module "dojox/layout/RotatorContainer" { - var exp: dojox.layout.RotatorContainer + var exp: typeof dojox.layout.RotatorContainer export=exp; } declare module "dojox/layout/TableContainer" { - var exp: dojox.layout.TableContainer + var exp: typeof dojox.layout.TableContainer export=exp; } declare module "dojox/layout/TableContainer.ChildWidgetProperties" { @@ -11495,14 +11496,14 @@ declare module "dojox/layout/TableContainer.ChildWidgetProperties" { export=exp; } declare module "dojox/layout/ScrollPane" { - var exp: dojox.layout.ScrollPane + var exp: typeof dojox.layout.ScrollPane export=exp; } declare module "dojox/layout/dnd/Avatar" { - var exp: dojox.layout.dnd.Avatar + var exp: typeof dojox.layout.dnd.Avatar export=exp; } declare module "dojox/layout/dnd/PlottedDnd" { - var exp: dojox.layout.dnd.PlottedDnd + var exp: typeof dojox.layout.dnd.PlottedDnd export=exp; }