diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 5a86e22b5..6b0fe4683 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -537,9 +537,16 @@ declare module ng { directive(directivesMap: any): ICompileProvider; } - interface ITemplateLinkingFunction { + interface ICloneAttachFunction { // Let's hint but not force cloneAttachFn's signature - (scope: IScope, cloneAttachFn?: (clonedElement?: JQuery, scope?: IScope) => any): JQuery; + (clonedElement?: JQuery, scope?: IScope): any; + } + + interface ITemplateLinkingFunction { + // If the scope is provided, then the cloneAttachFn must be as well. + (scope: IScope, cloneAttachFn: ICloneAttachFunction): JQuery; + // If one argument is provided, then it's assumed to be the cloneAttachFn. + (cloneAttachFn?: ICloneAttachFunction): JQuery; } /////////////////////////////////////////////////////////////////////////// @@ -827,4 +834,4 @@ declare module ng { } } -} \ No newline at end of file +} diff --git a/d3/d3.d.ts b/d3/d3.d.ts index 0c0be2178..126f2d95b 100644 --- a/d3/d3.d.ts +++ b/d3/d3.d.ts @@ -2442,6 +2442,7 @@ declare module D3 { (values: any[]): Scale; (): any[]; }; + invertExtent(y: any): any[]; copy(): Scale; } diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts index 35a954e95..6508e81a7 100644 --- a/jquery/jquery-tests.ts +++ b/jquery/jquery-tests.ts @@ -898,6 +898,16 @@ function test_data() { $.data(document.getElementById("id"), "", "8").toUpperCase(); } +function test_removeData() { + $("span:eq(0)").text("" + $("div").data("test1")); + $("div").data("test1", "VALUE-1"); + $("div").data("test2", "VALUE-2"); + $("span:eq(1)").text("" + $("div").data("test1")); + $("div").removeData("test1"); + $("span:eq(2)").text("" + $("div").data("test1")); + $("span:eq(3)").text("" + $("div").data("test2")); +} + function test_dblclick() { $('#target').dblclick(function () { alert('Handler for .dblclick() called.'); @@ -1814,6 +1824,20 @@ function test_outerWidth() { " , outerWidth( true ):" + p.outerWidth(true)); } +function test_scrollLeft() { + var p = $("p:first"); + $("p:last").text("scrollLeft:" + p.scrollLeft()); + + $("div.demo").scrollLeft(300); +} + +function test_scrollTop() { + var p = $("p:first"); + $("p:last").text("scrollTop:" + p.scrollTop()); + + $("div.demo").scrollTop(300); +} + function test_position() { var p = $("p:first"); var position = p.position(); @@ -1832,6 +1856,39 @@ function test_insertBefore() { $("p").insertBefore("#foo"); } +function test_promise() { + var div = $("
"); + + div.promise().done(function (arg1) { + // Will fire right away and alert "true" + alert(this === div && arg1 === div); + }); + + $("button").on("click", function () { + $("p").append("Started..."); + + $("div").each(function (i) { + $(this).fadeIn().fadeOut(1000 * (i + 1)); + }); + + $("div").promise().done(function () { + $("p").append(" Finished! "); + }); + }); + + var effect = function () { + return $("div").fadeIn(800).delay(1200).fadeOut(); + }; + + $("button").on("click", function () { + $("p").append(" Started... "); + + $.when(effect()).done(function () { + $("p").append(" Finished! "); + }); + }); +} + function test_is() { $("ul").click(function (event) { var $target = $(event.target); diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts index 01e75e118..992213c39 100644 --- a/jquery/jquery.d.ts +++ b/jquery/jquery.d.ts @@ -1067,10 +1067,26 @@ interface JQuery { */ position(): JQueryCoordinates; + /** + * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element. + */ scrollLeft(): number; + /** + * Set the current horizontal position of the scroll bar for each of the set of matched elements. + * + * @param value An integer indicating the new position to set the scroll bar to. + */ scrollLeft(value: number): JQuery; + /** + * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element. + */ scrollTop(): number; + /** + * Set the current vertical position of the scroll bar for each of the set of matched elements. + * + * @param value An integer indicating the new position to set the scroll bar to. + */ scrollTop(value: number): JQuery; /** @@ -1114,19 +1130,64 @@ interface JQuery { */ width(func: (index: number, width: number) => string): JQuery; - // Data + /** + * Remove from the queue all items that have not yet been run. + * + * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. + */ clearQueue(queueName?: string): JQuery; + /** + * Store arbitrary data associated with the matched elements. + * + * @param key A string naming the piece of data to set. + * @param value The new data value; it can be any Javascript type including Array or Object. + */ data(key: string, value: any): JQuery; + /** + * Store arbitrary data associated with the matched elements. + * + * @param obj An object of key-value pairs of data to update. + */ data(obj: { [key: string]: any; }): JQuery; - data(key?: string): any; + /** + * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute. + * + * @param key Name of the data stored. + */ + data(key: string): any; + /** + * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute. + */ + data(): any; + /** + * Execute the next function on the queue for the matched elements. + * + * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. + */ dequeue(queueName?: string): JQuery; - removeData(nameOrList?: any): JQuery; + /** + * Remove a previously-stored piece of data. + * + * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete. + */ + removeData(name: string): JQuery; + /** + * Remove a previously-stored piece of data. + * + * @param list An array of strings naming the pieces of data to delete. + */ + removeData(list: string[]): JQuery; - // Deferred - promise(type?: any, target?: any): JQueryPromise; + /** + * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished. + * + * @param type The type of queue that needs to be observed. (default: fx) + * @param target Object onto which the promise methods have to be attached + */ + promise(type?: string, target?: Object): JQueryPromise; // Effects animate(properties: any, duration?: any, complete?: Function): JQuery; diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts index 14a1d2579..3a1823a92 100644 --- a/jqueryui/jqueryui.d.ts +++ b/jqueryui/jqueryui.d.ts @@ -185,6 +185,8 @@ declare module JQueryUI { title?: string; width?: any; // number or string zIndex?: number; + + close?: DialogEvent; } interface DialogUIParams { @@ -561,9 +563,15 @@ declare module JQueryUI { heightStyle?: string; hide?: any; // boolean, number, string or object show?: any; // boolean, number, string or object + + activate?: TabsEvent; } interface TabsUIParams { + newTab: JQuery; + oldTab: JQuery; + newPanel: JQuery; + oldPanel: JQuery; } interface TabsEvent { diff --git a/openlayers/openlayers.d.ts b/openlayers/openlayers.d.ts index ea489bc12..ba9f6baea 100644 --- a/openlayers/openlayers.d.ts +++ b/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 - {} */ - private adjustBounds(bounds: Bounds): Bounds; + adjustBounds(bounds: Bounds): Bounds; static CLASS_NAME: string; } diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts index e633d8ac2..a329b20bf 100644 --- a/restangular/restangular.d.ts +++ b/restangular/restangular.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Restangular v0.8.0 - 2013-06-03 +// Type definitions for Restangular v1.2.2 - 2014-01-10 // Project: https://github.com/mgonto/restangular // Definitions by: Boris Yankov // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -12,6 +12,9 @@ interface Restangular extends RestangularCustom { all(route: string): RestangularCollection; copy(fromElement: any): RestangularElement; withConfig(configurer: (RestangularProvider) => any): Restangular; + restangularizeElement(parent: any, element: any, route: string, collection?, reqParams?): RestangularElement; + restangularizeCollection(parent: any, element: any, route: string): RestangularCollection; + stripRestangular(element: any): any; } interface RestangularElement extends Restangular { diff --git a/winjs/winjs.d.ts b/winjs/winjs.d.ts index cba248b44..99a5e33c2 100644 --- a/winjs/winjs.d.ts +++ b/winjs/winjs.d.ts @@ -13,39 +13,59 @@ See the Apache Version 2.0 License for specific language governing permissions and limitations under the License. ***************************************************************************** */ +/// + declare module WinJS { function strictProcessing(): void; + + export module Application { + export var onsettings: EventListener; + } + module Binding { function as(data: any): any; - class List { - constructor(data?: any[]); - public push(item: any): any; - public indexOf(item: any): number; - public splice(start: number, howMany?: number, item?: any[]): any[]; - public createFiltered(predicate: (x: any) => boolean): List; - public createGrouped(keySelector: (x: any) => any, dataSelector: (x:any) => any, groupSorter: (left:any, right:any) => number): List; - public groups: any; + function processAll(rootElement?: any, dataContext?: any, skipRoot?: boolean, bindingCache?: any): any; + function define(data: any): any; + function expandProperties(data: any): any; + function converter(method: any): any; + + export var optimizeBindingReferences: boolean; + export var mixin: any; + export var bind: any; + export var oneTime: any; + + export function initializer(customInit: any): any; + export var setAttribute: any; + + class List { + constructor(data?: T[], options?: { binding: boolean; proxy: boolean; }); + public push(item: T): number; + public indexOf(item: T, fromIndex?: number): number; + public splice(start: number, howMany?: number, ...items: T[]): T[]; + public createFiltered(predicate: (x: T) => boolean): List; + public createGrouped(keySelector: (x: T) => string, dataSelector: (x:T) => U, groupSorter?: (left:string, right:string) => number): List; + public createSorted(sorter: (left:T, right:T) => number): List; + public groups: List; public dataSource: any; - public getAt(index: number): any; - public createSorted(sorter: (left, right) => number); - public forEach(callback: (val: any, index: number, array: any[]) => void, thisArg?: any); - public every(callback: (val: any, index: number, array: any[]) => boolean, thisArg?: any): boolean; + public getAt(index: number): T; + public forEach(callback: (val: T, index: number, array: T[]) => void, thisArg?: any): void; + public every(callback: (val: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; public join(separator: string): string; - public map(callback: (val: any, index: number, array: any[]) => any, thisArg?: any): any[]; - public move(index: number, newIndex: number); - public pop(): any; + public map(callback: (val: T, index: number, array: T[]) => U, thisArg?: any): U[]; + public move(index: number, newIndex: number): void; + public pop(): T; public reduce(callback: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; public reduceRight(callback: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; - public reverse(); - public setAt(index: number, newValue: number); - public shift(): any; - public slice(begin: number, end: number): WinJS.Binding.List; - public some(callback: (val: any, index: number, array: any[]) => boolean, thisArg?: any): boolean; - public sort(sortFunction: (left, right) => number); - public unshift(value: any): number; + public reverse(): void; + public setAt(index: number, newValue: T): void; + public shift(): T; + public slice(begin: number, end: number): List; + public some(callback: (val: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; + public sort(sortFunction: (left: T, right: T) => number): void; + public filter(callback: (val: T, index: number, array: T[]) => boolean, thisArg?: any): T[]; + public unshift(value: T): number; public length: number; - public notifyMutated(index: number); - + public notifyMutated(index: number): void; } class Template { public element: HTMLElement; @@ -61,7 +81,7 @@ declare module WinJS { (dataContext: any, container?: HTMLElement): WinJS.Promise; value(href: string, dataContext: any, container?: HTMLElement): WinJS.Promise; }; - public renderItem(item: any, recycled?: HTMLElement); + public renderItem(item: any, recycled?: HTMLElement): void; } @@ -73,7 +93,7 @@ declare module WinJS { module Class { function define(constructor: any, instanceMembers: any): any; function derive(baseClass: any, constructor: any, instanceMembers: any): any; - function mix(constructor: any, mixin: any): any; + function mix(constructor: any, ...mixin: any[]): any; } function xhr(options: { type?: string; url?: string; user?: string; password?: string; headers?: any; data?: any; responseType?: string; }): WinJS.Promise; module Application { @@ -100,15 +120,21 @@ declare module WinJS { class ErrorFromName { constructor(name: string, message?: string); } - class Promise { + class Promise implements Windows.Foundation.IPromise { constructor(init: (c: any, e: any, p: any) => void); - then(success?: (value: T) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void ): Promise; - then(success?: (value: T) => Promise, error?: (error: any) => U, progress?: (progress: any) => void ): Promise; - then(success?: (value: T) => U, error?: (error: any) => Promise, progress?: (progress: any) => void ): Promise; - then(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Promise; + then(success?: (value: T) => Windows.Foundation.IPromise, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: (value: T) => Windows.Foundation.IPromise, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: (value: T) => U, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise; done(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void; - static join: any; - static timeout: any; + + cancel(): void; + + static join(values: any[]): Promise; + static timeout(timeout: number): Promise; + static as(): Promise; + static as(obj: U): Promise; + static wrapError(obj: U): Promise; } module Navigation { var history: any; @@ -119,16 +145,30 @@ declare module WinJS { function addEventListener(type: string, listener: EventListener, capture: boolean): void; function back(): void; function forward(): void; - function navigate(location: any, initialState: any); - function navigate(location: any); + function navigate(location: any, initialState: any): WinJS.Promise; + function navigate(location: any): WinJS.Promise; function removeEventListener(type: string, listener: EventListener, capture: boolean): void; var onbeforenavigate: CustomEvent; var onnavigated: CustomEvent; var onnavigating: CustomEvent; } + + export module Resources { + export var processAll: (element?: HTMLElement) => void; + export var getString: (id: string) => { value: string; empty?: boolean; lang?: string; }; + export var addEventListener: (id: string, handler: EventListener, useCapture?: boolean) => void; + } + module Utilities { - function markSupportedForProcessing(obj: any): void; - enum Key { + function markSupportedForProcessing(obj: T): T; + function createEventProperties(...events: string[]): any; + + export function addClass(element: HTMLElement, className: string): void; + export function removeClass(element: HTMLElement, className: string): void; + + export function hasClass(element: HTMLElement, className: string): boolean; + + enum Key { backspace, tab, enter, @@ -235,9 +275,58 @@ declare module WinJS { var ListLayout: any; var GridLayout: any; var Pages: any; - var Menu: any; - var setOptions: any; + var setOptions: any; + + export var Animation: any; + + var DOMEventMixin: any; + + class Flyout { + constructor(element: HTMLElement, options: any); + element: Element; + } + + module Fragments { + var renderCopy: any; + } + + export class HtmlControl { + constructor(element: HTMLElement, options: { uri: string; }); + } + + interface IItem { + data: any; + } + + interface ISelection { + clear(): WinJS.Promise; + count(): number; + getItems(): WinJS.Promise; + } + + class ListView { + element: Element; + elementFromIndex(index: number): Element; + indexOfElement(element: Element): number; + selection: ISelection; + } + + class Menu { + constructor(element: HTMLElement, options: any); + element: Element; + } + + export class MenuCommand { + constructor(element: HTMLElement, options: any); + } + + export class SettingsFlyout { + static populateSettings(e: any): any; + static showSettings(id: string, path: any): any; + } } + + export function xhr(options: { type: string; url: string; }): WinJS.Promise; // user: string; password: string; headers: any; data: any; responseType: string; } interface Element { diff --git a/winrt/winrt.d.ts b/winrt/winrt.d.ts index 11f1dba86..881b64ed3 100644 --- a/winrt/winrt.d.ts +++ b/winrt/winrt.d.ts @@ -496,6 +496,14 @@ declare module Windows { close(): void; } export interface IAsyncAction extends Windows.Foundation.IAsyncInfo { + then(success?: () => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; + then(success?: () => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; + then(success?: () => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; + then(success?: () => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; + done? (success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void; + + cancel(): void; + completed: Windows.Foundation.AsyncActionCompletedHandler; getResults(): void; } @@ -521,7 +529,7 @@ declare module Windows { export interface AsyncActionWithProgressCompletedHandler { (asyncInfo: Windows.Foundation.IAsyncActionWithProgress, asyncStatus: Windows.Foundation.AsyncStatus): void; } - export interface IAsyncActionWithProgress extends Windows.Foundation.IAsyncInfo { + export interface IAsyncActionWithProgress extends Windows.Foundation.IAsyncInfo, Windows.Foundation.IPromise { progress: Windows.Foundation.AsyncActionProgressHandler; completed: Windows.Foundation.AsyncActionWithProgressCompletedHandler; getResults(): void; @@ -3301,11 +3309,11 @@ declare module Windows { getResults(): void; cancel(): void; close(): void; - then(success: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success: (value: any) => Windows.Foundation.IPromise, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success: (value: any) => U, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success: (value: any) => Windows.Foundation.IPromise, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - done(success: (value: any) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void; + then(success?: () => Windows.Foundation.IPromise, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: () => Windows.Foundation.IPromise, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: () => U, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: () => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise; + done(success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void ; operation: { completed: Windows.Foundation.AsyncOperationCompletedHandler; getResults(): any; @@ -8385,11 +8393,11 @@ declare module Windows { getResults(): void; cancel(): void; close(): void; - then(success: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success: (value: any) => Windows.Foundation.IPromise, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success: (value: any) => U, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success: (value: any) => Windows.Foundation.IPromise, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - done(success: (value: any) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void; + then(success?: () => Windows.Foundation.IPromise, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: () => Windows.Foundation.IPromise, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: () => U, error?: (error: any) => Windows.Foundation.IPromise, progress?: (progress: any) => void): Windows.Foundation.IPromise; + then(success?: () => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise; + done(success?: () => any, error?: (error: any) => any, progress?: (progress: any) => void): void; operation: { completed: Windows.Foundation.AsyncOperationCompletedHandler; getResults(): any; @@ -14635,10 +14643,12 @@ declare module Windows { } declare module Windows.Foundation { export interface IPromise { - then(success?: (value: T) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success?: (value: T) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success?: (value: T) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - then(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise; - done?(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void; + then(success?: (value: T) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void ): IPromise; + then(success?: (value: T) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise; + then(success?: (value: T) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void ): IPromise; + then(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise; + done?(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void): void; + + cancel(): void; } }