diff --git a/rx.js/rx.jquery.d.ts b/rx.js/rx.jquery.d.ts
index 75db935a9..fd9311ee4 100644
--- a/rx.js/rx.jquery.d.ts
+++ b/rx.js/rx.jquery.d.ts
@@ -1,58 +1,10 @@
-///
-///
-
-// Those are the definitions for bridging Rx with jQuery.
-//
-// Using the https://github.com/Reactive-Extensions/rxjs-jquery project
-//
-// Dependencies:
-// -> rx.js
-// -> rx.jquery.js
-// -> jquery.js
-
-declare module JQueryResults {
-
- export interface eventBase{
- bubbles: boolean;
- cancelable: boolean;
- type: string;
- preventDefault(): void;
- isDefaultPrevented(): boolean;
- stopPropagation(): void;
- isPropagationStopped(): boolean;
- data: any;
- originalEvent: any;
- eventPhase: number;
- }
-
- export interface keyEvent extends eventBase {
- key: number;
- keyCode: number;
- altKey: boolean;
- ctrlKey: boolean;
- shiftKey: boolean;
- char: string;
- metaKey: boolean;
- }
-
- export interface uiEvent extends eventBase{
- target: any;
- currentTarget: any;
- }
-
- export interface mouseEvent extends keyEvent{
- clientX: number;
- clientY: number;
- screenX: number;
- screenY: number;
- offsetX: number;
- offsetY: number;
- pageX: number;
- pageY: number;
- which: number;
- }
-}
+// Type definitions for bridging RxJS with jQuery.
+// Project: https://github.com/Reactive-Extensions/RxJS-jQuery/
+// Revision by: Igor Oleinikov
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+///
+///
interface JQueryStatic {
ajaxAsObservable(settings: JQueryAjaxSettings): Rx.Observable;
@@ -63,29 +15,34 @@ interface JQueryStatic {
}
interface JQuery {
- changeAsObservable(eventData?: any): Rx.Observable;
- clickAsObservable(eventData?: any): Rx.Observable;
- dblclickAsObservable(eventData?: any): Rx.Observable;
- focusAsObservable(eventData?: any): Rx.Observable;
- focusinAsObservable(eventData?: any): Rx.Observable;
- focusoutAsObservable(eventData?: any): Rx.Observable;
- keydownAsObservable(eventData?: any): Rx.Observable;
- keyupAsObservable(eventData?: any): Rx.Observable;
- loadAsObservable(eventData?: any): Rx.Observable;
- mousedownAsObservable(eventData?: any): Rx.Observable;
- mouseenterAsObservable(eventData?: any): Rx.Observable;
- mouseleaveAsObservable(eventData?: any): Rx.Observable;
- mousemoveAsObservable(eventData?: any): Rx.Observable;
- mouseoutAsObservable(eventData?: any): Rx.Observable;
- mouseoverAsObservable(eventData?: any): Rx.Observable;
- mouseupAsObservable(eventData?: any): Rx.Observable;
- resizeAsObservable(eventData?: any): Rx.Observable;
- scrollAsObservable(eventData?: any): Rx.Observable;
- selectAsObservable(eventData?: any): Rx.Observable;
- submitAsObservable(eventData?: any): Rx.Observable;
- unloadAsObservable(eventData?: any): Rx.Observable;
- hideAsObservable(duration: number): Rx.Observable;
- showAsObservable(duration: number): Rx.Observable;
+ onAsObservable(events: string, selector?: string, eventData?: any): Rx.Observable;
+ bindAsObservable(eventType: string, eventData?: any): Rx.Observable;
+ delegateAsObservable(selector: string, eventType: string, eventData?: any): Rx.Observable;
+ //liveAsObservable(eventType: string, eventData?: any): Rx.Observable; // removed in jquery 1.9
+
+ changeAsObservable(eventData?: any): Rx.Observable;
+ clickAsObservable(eventData?: any): Rx.Observable;
+ dblclickAsObservable(eventData?: any): Rx.Observable;
+ focusAsObservable(eventData?: any): Rx.Observable;
+ focusinAsObservable(eventData?: any): Rx.Observable;
+ focusoutAsObservable(eventData?: any): Rx.Observable;
+ keydownAsObservable(eventData?: any): Rx.Observable;
+ keyupAsObservable(eventData?: any): Rx.Observable;
+ loadAsObservable(eventData?: any): Rx.Observable;
+ mousedownAsObservable(eventData?: any): Rx.Observable;
+ mouseenterAsObservable(eventData?: any): Rx.Observable;
+ mouseleaveAsObservable(eventData?: any): Rx.Observable;
+ mousemoveAsObservable(eventData?: any): Rx.Observable;
+ mouseoutAsObservable(eventData?: any): Rx.Observable;
+ mouseoverAsObservable(eventData?: any): Rx.Observable;
+ mouseupAsObservable(eventData?: any): Rx.Observable;
+ resizeAsObservable(eventData?: any): Rx.Observable;
+ scrollAsObservable(eventData?: any): Rx.Observable;
+ selectAsObservable(eventData?: any): Rx.Observable;
+ submitAsObservable(eventData?: any): Rx.Observable;
+ unloadAsObservable(eventData?: any): Rx.Observable;
+ hideAsObservable(duration: number): Rx.Observable;
+ showAsObservable(duration: number): Rx.Observable;
readyAsObservable(): Rx.Observable;
animateAsObservable(properties: any, duration: number, easing?: string): Rx.Observable;
fadeInAsObservable(duration: number, easing?: string): Rx.Observable;
@@ -96,4 +53,4 @@ interface JQuery {
slideUpAsObservable(duration: number): Rx.Observable;
slideToggleAsObservable(duration: number): Rx.Observable;
toggleAsObservable(duration: number): Rx.Observable;
-}
\ No newline at end of file
+}