Merge remote-tracking branch 'upstream/master'

README.md

@@ -40,6 +40,7 @@ Complete
 * [jQuery.BBQ](http://benalman.com/projects/jquery-bbq-plugin/) (by [Adam R. Smith](https://github.com/sunetos))
 * [jQuery.Cookie](https://github.com/carhartl/jquery-cookie) (by [Roy Goode](https://github.com/RoyGoode))
 * [jQuery.Globalize](https://github.com/jquery/globalize) (by [Boris Yankov](https://github.com/borisyankov))
+* [jQuery.jNotify]( http://jnotify.codeplex.com) (by [James Curran](https://github.com/jamescurran/))
 * [jQuery.Timepicker](http://fgelinas.com/code/timepicker/) (by [Anwar Javed](https://github.com/anwarjaved))
 * [jQuery.Transit](http://ricostacruz.com/jquery.transit/) (by [MrBigDog2U](https://github.com/MrBigDog2U))
 * [jQuery.Validation](http://bassistance.de/jquery-plugins/jquery-plugin-validation/) (by [Boris Yankov](https://github.com/borisyankov))

angularjs/angular-1.0.d.ts

@@ -509,6 +509,7 @@ module ng {
 
     interface IHttpProvider extends IServiceProvider {        
         defaults: IRequestConfig;
+        responseInterceptors: any[];
     }
 
     ///////////////////////////////////////////////////////////////////////////

jquery.jnotify/jquery.jnotify-1.0.d.ts

@@ -0,0 +1,25 @@
+// Typescript type definitions for jQuery.jNotify 1.0 by Fabio Franzini
+// Project: http://jnotify.codeplex.com
+// Definitions by: James Curran <https://github.com/jamescurran/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+/// <reference path='../jquery/jquery-1.8.d.ts'/>
+
+interface JNotifyInitOptions {
+    oneAtTime?: bool;
+    appendType?: string;
+}
+
+interface JNotifyOptions {
+    text?: string;
+    type?: string;
+    showIcon?: bool;
+    permanent?: bool;
+    disappearTime?: number;
+}
+
+interface JQuery {
+    jnotifyInizialize(options?: JNotifyInitOptions);
+    jnotifyAddMessage(options?: JNotifyOptions);
+}

jquery.jnotify/jquery.jnotify-tests.ts

@@ -0,0 +1,50 @@
+/// <reference path='../jquery/jquery-1.8.d.ts'/>
+/// <reference path='jquery.jnotify-1.0.d.ts'/>
+
+$(document).ready(function () {
+    $('#StatusBar').jnotifyInizialize({
+        oneAtTime: true
+    });
+    $('#Notification')
+        .jnotifyInizialize({
+            oneAtTime: false,
+            appendType: 'append'
+        })
+        .css({
+            'position': 'absolute',
+            'marginTop': '20px',
+            'right': '20px',
+            'width': '250px',
+            'z-index': '9999'
+        });
+    $('#addStatusBarMessage').click(function () {
+        $('#StatusBar').jnotifyAddMessage({
+            text: 'This is a non permanent message.',
+            permanent: false,
+            showIcon: false
+        });
+    });
+
+    $('#addStatusBarError').click(function () {
+        $('#StatusBar').jnotifyAddMessage({
+            text: 'This is a permanent error.',
+            permanent: true,
+            type: 'error'
+        });
+    });
+
+    $('#addNotificationMessage').click(function () {
+        $('#Notification').jnotifyAddMessage({
+            text: 'This is a non permanent message.',
+            permanent: false
+        });
+    });
+
+    $('#addNotificationError').click(function () {
+        $('#Notification').jnotifyAddMessage({
+            text: 'This is a permanent error.',
+            permanent: true,
+            type: 'error'
+        });
+    });
+});

jquery/jquery-1.8.d.ts

@@ -246,7 +246,7 @@ interface JQueryStatic {
     /******
      EVENTS
     *******/
-    proxy(context: any, name: any): any;
+    proxy(context: any, name: any, ...args: any[]): any;
     Deferred(): JQueryDeferred;
     Event(name:string, eventProperties?:any): JQueryEventObject;
 

knockout/knockout-2.2.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Knockout 2.2
+// Type definitions for Knockout 2.2
 // Project: http://knockoutjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -62,7 +62,7 @@ interface KnockoutComputedStatic {
     fn: KnockoutComputedFunctions;
 
     (): KnockoutComputed;
-    (func: Function, context?: any): KnockoutComputed;
+    (func: Function, context?: any, options?: any): KnockoutComputed;
     (def: KnockoutComputedDefine): KnockoutComputed;
     (options?: any): KnockoutComputed;
 }