diff --git a/Definitions/jqueryui-1.9.d.ts b/Definitions/jqueryui-1.9.d.ts index a9788562c..d8dd1d9e4 100644 --- a/Definitions/jqueryui-1.9.d.ts +++ b/Definitions/jqueryui-1.9.d.ts @@ -1,9 +1,8 @@ -/// - // Type definitions for jQueryUI 1.9 // Project: http://jqueryui.com/ // Definitions: https://github.com/borisyankov/DefinitelyTyped +/// // Widget ////////////////////////////////////////////////// @@ -40,16 +39,7 @@ interface Accordion extends Widget { icons?: any; // Methods - destroy(); - disable(); - enable(); - option(optionName: string): any; - option(): any; - option(optionName: string, value: any): void; - option(options: any): void; - refresh(); - widget(): JQuery; - + // Events activate(event: Event, ui): void; beforeActivate(event: Event, ui): void; @@ -59,7 +49,7 @@ interface Accordion extends Widget { // Autocomplete ////////////////////////////////////////////////// -interface Autocomplete { +interface Autocomplete extends Widget { // Options appendTo?: any; //Selector; @@ -71,16 +61,8 @@ interface Autocomplete { source?: any; // [], string or () // Methods - close(); - destroy(); - disable(); - enable(); - option(optionName: string): any; - option(): any; - option(optionName: string, value: any): void; - option(options: any): void; + close(); search(value?: string); - widget(): JQuery; // Events change(event: Event, ui): void; @@ -96,7 +78,7 @@ interface Autocomplete { // Button ////////////////////////////////////////////////// -interface Button { +interface Button extends Widget { // Options disabled?: bool; @@ -104,16 +86,8 @@ interface Button { label?: string; text?: bool; - // Methods - destroy(); - disable(); - enable(); - option(optionName: string): any; - option(): any; - option(optionName: string, value: any): void; - option(options: any): void; + // Methods refresh(); - widget(): JQuery; // Events create(event: Event, ui): void; @@ -122,7 +96,7 @@ interface Button { // Datepicker ////////////////////////////////////////////////// -interface Datepicker { +interface Datepicker extends Widget { // Options altFieldType?: any; // Selecotr, jQuery or Element @@ -178,7 +152,7 @@ interface Datepicker { // Methods destroy(); - dialog(date: any, onSelect?: (), settings?: any, pos?: any); + dialog(date: any, onSelect?: () => void, settings?: any, pos?: any); getDate(): Date; hide(): void; isDisabled(): bool; @@ -192,7 +166,7 @@ interface Datepicker { // Dialog ////////////////////////////////////////////////// -interface Dialog { +interface Dialog extends Widget { // Options autoOpen?: bool; @@ -356,7 +330,7 @@ interface JQueryDatePicker { // Menu ////////////////////////////////////////////////// -interface Menu { +interface Menu extends Widget { // Options disabled?: bool; @@ -369,24 +343,15 @@ interface Menu { blur(event?: Event): void; collapse(event?: Event): void; blurAll(event?: Event, all?: bool): void; - destroy(); - disable(); - enable(); expand(event?: Event): void; focus(event?: Event, item?: JQuery): void; isFirstItem(): bool; isLastItem(): bool; next(event?: Event): void; nextPage(event?: Event): void; - option(optionName: string): any; - option(): any; - option(optionName: string, value: any): void; - option(options: any): void; previous(event?: Event): void; previousPage(event?: Event): void; - refresh(): void; select(event?: Event): void; - widget(): JQuery; // Events blur(event: Event, ui): void; @@ -398,11 +363,11 @@ interface Menu { // Progressbar ////////////////////////////////////////////////// -interface Progressbar { +interface Progressbar extends Widget { // Options disabled?: bool; - value?: number; + //value?: number; // Methods destroy(); @@ -423,6 +388,64 @@ interface Progressbar { } +// Resizable ////////////////////////////////////////////////// + +interface Resizable extends Widget { + + // Options + alsoResize?: any; // Selector, JQuery or Element + animate?: bool; + animateDuration?: any; // number or string + animateEasing?: string; + aspectRatio?: any; // bool or number + autoHide?: bool; + cancel?: any; // TODO Selector + containment?: any; // Selector, Element or string + delay?: number; + disabled?: bool; + distance?: number; + ghost?: bool; + grid?: number[]; + handles?: any; // string or object + helper?: string; + maxHeight?: number; + maxWidth?: number; + minHeight?: number; + minWidth?: number; + + // Methods + + // Events + resize(event: Event, ui): void; + start(event: Event, ui): void; + stop(event: Event, ui): void; +} + + +// Resizable ////////////////////////////////////////////////// + +interface Selectable extends Widget { + + // Options + autoRefresh?: bool; + cancel?: any; // TODO Selector + delay?: number; + disabled?: bool; + distance?: number; + filter?: any; // TODO Selector + tolerance?: string; + + // Methods + + // Events + selected(event: Event, ui): void; + selecting(event: Event, ui): void; + start(event: Event, ui): void; + stop(event: Event, ui): void; + unselected(event: Event, ui): void; + unselecting(event: Event, ui): void; +} + // Slider ////////////////////////////////////////////////// interface Slider extends Widget { @@ -435,8 +458,8 @@ interface Slider extends Widget { orientation?: string; range?: any; // bool or string step?: number; - value?: number; - values?: number[]; + // value?: number; + // values?: number[]; // Methods value(): number; @@ -444,7 +467,7 @@ interface Slider extends Widget { values(): number[]; values(index: number): number; values(index: number, newValue: number): void; - values(newValues: numbers[]): void; + values(newValues: number[]): void; // Events change(event: Event, ui): void; @@ -455,9 +478,62 @@ interface Slider extends Widget { } +// Sortable ////////////////////////////////////////////////// + +interface Sortable extends Widget { + + // Options + appendTo?: any; // jQuery, Element, Selector or string + axis?: string; + // cancel?: any; // TODO Selector + connectWith?: any; // TODO Selector + containment?: any; // Element, Selector or string + cursor?: string; + cursorAt?: any; + delay?: number; + disabled?: bool; + distance?: number; + dropOnEmpty?: bool; + forceHelperSize?: bool; + forcePlaceholderSize?: bool; + grid?: number[]; + handle?: any; // Selector or Element + items?: any; // Selector + opacity?: number; + placeholder?: string; + revert?: any; // bool or number + scroll?: bool; + scrollSensitivity?: number; + scrollSpeed?: number; + tolerance?: string; + zIndex?: number; + + // Methods + cancel(): void; + refreshPositions(): void; + serialize(options: any): void; // TODO + toArray(): string[]; + + // Events + activate(event: Event, ui): void; + beforeStop(event: Event, ui): void; + change(event: Event, ui): void; + deactivate(event: Event, ui): void; + out(event: Event, ui): void; + over(event: Event, ui): void; + receive(event: Event, ui): void; + remove(event: Event, ui): void; + sort(event: Event, ui): void; + start(event: Event, ui): void; + stop(event: Event, ui): void; + update(event: Event, ui): void; +} + + + // Spinner ////////////////////////////////////////////////// -interface Spinner { +interface Spinner extends Widget { // Options culture?: string; @@ -487,7 +563,7 @@ interface Spinner { // Tabs ////////////////////////////////////////////////// -interface Tabs { +interface Tabs extends Widget { // Options active?: any; // bool or number @@ -513,7 +589,7 @@ interface Tabs { // Tooltip ////////////////////////////////////////////////// -interface Tooltip { +interface Tooltip extends Widget { // Options content?: any; // () or string @@ -538,19 +614,48 @@ interface Tooltip { //////////////////////////////////////////////////////////////////////////////////////////////////// interface JQuery { - draggable(options: Draggable): JQuery; + + accordion(options?: Accordion): void; + + autocomplete(options?: Autocomplete): void; + + button(options?: Button): void; + buttonset(options?: Button): void; + + datepicker(options?: Datepicker): void; + + dialog(options?: Dialog): void; + dialog(optionLiteral: string): void; + + draggable(options?: Draggable): JQuery; draggable(optionLiteral: string, options: Draggable): JQuery; draggable(optionLiteral: string, optionName: string, optionValue: any): JQuery; draggable(optionLiteral: string, optionName: string): any; // draggable(methodName: string): any; + droppable(options: Droppable): JQuery; droppable(optionLiteral: string, options: Draggable): JQuery; droppable(optionLiteral: string, optionName: string, optionValue: any): JQuery; droppable(optionLiteral: string, optionName: string): any; droppable(methodName: string): any; - autocomplete(any): void; - datepicker(any): void; + menu(options?: Menu): void; + + progressbar(options?: Progressbar): void; + + resizable(options?: Resizable): void; + + selectable(options?: Selectable): void; + + slider(options?: Slider): void; + + sortable(options?: Sortable): void; + + spinner(options?: Spinner): void; + + tabs(options?: Tabs): void; + + tooltip(options?: Tooltip): void; } interface JQueryStatic { diff --git a/Tests/jqueryui-tests.ts b/Tests/jqueryui-tests.ts index f23317ffd..145bd64d1 100644 --- a/Tests/jqueryui-tests.ts +++ b/Tests/jqueryui-tests.ts @@ -15,24 +15,13 @@ $("#draggable3").draggable({ cursorAt: { bottom: 0 } }); $("#draggable").draggable(); $("#draggable").draggable({ distance: 20 }); $("#draggable2").draggable({ delay: 1000 }); -$(".ui-draggable").disableSelection(); $("#draggable").draggable({ - start: () => { - counts[0]++; - updateCounterStatus($start_counter, counts[0]); - }, - drag: () => { - counts[1]++; - updateCounterStatus($drag_counter, counts[1]); - }, - stop: () => { - counts[2]++; - updateCounterStatus($stop_counter, counts[2]); - } + start: () => { }, + drag: () => { }, + stop: () => { } }); $("#draggable").draggable({ handle: "p" }); $("#draggable2").draggable({ cancel: "p.ui-widget-header" }); -$("div, p").disableSelection(); $("#draggable").draggable({ revert: true }); $("#draggable2").draggable({ revert: true, helper: "clone" }); $("#draggable").draggable({ scroll: true }); @@ -43,23 +32,18 @@ $("#draggable2").draggable({ snap: ".ui-widget-header" }); $("#draggable3").draggable({ snap: ".ui-widget-header", snapMode: "outer" }); $("#draggable4").draggable({ grid: [20, 20] }); $("#draggable5").draggable({ grid: [80, 80] }); -$("#sortable").sortable({ - revert: true -}); +$("#sortable").sortable({ revert: true}); $("#draggable").draggable({ connectToSortable: "#sortable", helper: "clone", revert: "invalid" }); -$("ul, li").disableSelection(); $("#draggable").draggable({ helper: "original" }); $("#draggable2").draggable({ opacity: 0.7, helper: "clone" }); $("#draggable3").draggable({ cursor: "move", cursorAt: { top: -12, left: -20 }, - helper: (event) => { - return $("
I'm a custom helper
"); - } + helper: (event) => { return $("
I'm a custom helper
"); } }); $("#set div").draggable({ stack: "#set div" }); @@ -67,171 +51,158 @@ $("#set div").draggable({ stack: "#set div" }); // Droppable ////////////////////////////////////////////////// $( "#draggable, #draggable-nonvalid" ).draggable(); -$( "#droppable" ).droppable({ +$("#droppable").droppable({ accept: "#draggable", activeClass: "ui-state-hover", hoverClass: "ui-state-active", - drop:( event, ui ) => { - $( this ) - .addClass( "ui-state-highlight" ) - .find( "p" ) - .html( "Dropped!" ); + drop: (event, ui) => { + $(this) + .addClass("ui-state-highlight") + .find("p") + .html("Dropped!"); } }); $( "#draggable" ).draggable(); -$( "#droppable" ).droppable({ - drop: ( event, ui ) => { - $( this ) - .addClass( "ui-state-highlight" ) - .find( "p" ) - .html( "Dropped!" ); +$("#droppable").droppable({ + drop: (event, ui) => { + $(this) + .addClass("ui-state-highlight") + .find("p") + .html("Dropped!"); } }); - // there's the gallery and the trash - var $gallery = $( "#gallery" ), - $trash = $( "#trash" ); +var $gallery = $( "#gallery" ), + $trash = $( "#trash" ); +$("li", $gallery).draggable({ + cancel: "a.ui-icon", + revert: "invalid", + containment: "document", + helper: "clone", + cursor: "move" +}); - // let the gallery items be draggable - $( "li", $gallery ).draggable({ - cancel: "a.ui-icon", // clicking an icon won't initiate dragging - revert: "invalid", // when not dropped, the item will revert back to its initial position - containment: "document", - helper: "clone", - cursor: "move" - }); +$trash.droppable({ + accept: "#gallery > li", + activeClass: "ui-state-highlight", + drop: ( event, ui ) => { } +}); - // let the trash be droppable, accepting the gallery items - $trash.droppable({ - accept: "#gallery > li", - activeClass: "ui-state-highlight", - drop: ( event, ui ) => { - deleteImage( ui.draggable ); - } - }); +$gallery.droppable({ + accept: "#trash li", + activeClass: "custom-state-active", + drop: ( event, ui ) => { } +}); - // let the gallery be droppable as well, accepting items from the trash - $gallery.droppable({ - accept: "#trash li", - activeClass: "custom-state-active", - drop: ( event, ui ) => { - recycleImage( ui.draggable ); - } - }); - - // image deletion function - var recycle_icon = "Recycle image"; - function deleteImage( $item ) { - $item.fadeOut(() => { - var $list = $( "ul", $trash ).length ? - $( "ul", $trash ) : - $( "