From 0690841c6b5d33bfcbf91be3b02f13e63c990ed1 Mon Sep 17 00:00:00 2001
From: Martin McWhorter <martin@mcwhorter.org>
Date: Mon, 10 Feb 2014 17:40:59 +0000
Subject: [PATCH 01/15] Update angular.d.ts

The listener may take a single event argument.
---
 angularjs/angular.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index a8c1d991d..10dec18ae 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -227,6 +227,7 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
+        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From 045537ef49c478296abc3becf0ea5d27be326823 Mon Sep 17 00:00:00 2001
From: Martin McWhorter <martin@mcwhorter.org>
Date: Tue, 25 Feb 2014 17:32:17 +0000
Subject: [PATCH 02/15] Update angular-ui-router.d.ts

---
 angular-ui/angular-ui-router.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index da3d92e5e..285149a0d 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -84,6 +84,7 @@ declare module ng.ui {
         get(state: string): IState;
         get(): IState[];
         current: IState;
+        $current: IState;
         params: IStateParamsService;
     }
 

From 17e72ca4827f7d9f3e92b3322f0021771301b8cb Mon Sep 17 00:00:00 2001
From: Martin McWhorter <martin@mcwhorter.org>
Date: Tue, 25 Feb 2014 17:37:58 +0000
Subject: [PATCH 03/15] Revert "Update angular.d.ts"

This reverts commit 0690841c6b5d33bfcbf91be3b02f13e63c990ed1.
---
 angularjs/angular.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 10dec18ae..a8c1d991d 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -227,7 +227,6 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
-        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From 11737fa5b1cceb4401f7c7435b0da4bdc1c334c6 Mon Sep 17 00:00:00 2001
From: Martin McWhorter <martin@mcwhorter.org>
Date: Mon, 10 Feb 2014 17:40:59 +0000
Subject: [PATCH 04/15] Update angular.d.ts

The listener may take a single event argument.
---
 angularjs/angular.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index e447985fb..59a33e715 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -337,6 +337,7 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
+        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From 783404bd8a37e11559f499ce16465d25d5c88f2f Mon Sep 17 00:00:00 2001
From: Martin McWhorter <martin@mcwhorter.org>
Date: Tue, 25 Feb 2014 17:32:17 +0000
Subject: [PATCH 05/15] Update angular-ui-router.d.ts

---
 angular-ui/angular-ui-router.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 081d35723..889325aa4 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -85,6 +85,7 @@ declare module ng.ui {
         get(state: string): IState;
         get(): IState[];
         current: IState;
+        $current: IState;
         params: IStateParamsService;
         reload(): void;
     }

From 18ef03e31dfc89e937de12d43206f288c72d98b2 Mon Sep 17 00:00:00 2001
From: Martin McWhorter <martin@mcwhorter.org>
Date: Tue, 25 Feb 2014 17:37:58 +0000
Subject: [PATCH 06/15] Revert "Update angular.d.ts"

This reverts commit 0690841c6b5d33bfcbf91be3b02f13e63c990ed1.
---
 angularjs/angular.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 59a33e715..e447985fb 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -337,7 +337,6 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
-        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From 9bdeb5e6c85654a38684cf2a4914d05706da64ce Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:01:21 +0100
Subject: [PATCH 07/15] Revert 783404b..18ef03e

This rolls back to commit 783404bd8a37e11559f499ce16465d25d5c88f2f.
---
 angularjs/angular.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index e447985fb..59a33e715 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -337,6 +337,7 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
+        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From 8d1e03ff7791b3f4fc79846ba8995110d917a174 Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:01:40 +0100
Subject: [PATCH 08/15] Revert aec2fa9..9bdeb5e

This rolls back to commit aec2fa9e392a883dfa4467ba12a6934f24d50a9e.
---
 angular-ui/angular-ui-router.d.ts | 1 -
 angularjs/angular.d.ts            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 889325aa4..081d35723 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -85,7 +85,6 @@ declare module ng.ui {
         get(state: string): IState;
         get(): IState[];
         current: IState;
-        $current: IState;
         params: IStateParamsService;
         reload(): void;
     }
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 59a33e715..e447985fb 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -337,7 +337,6 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
-        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From d5ddb0544b0455cf20702f4af36d6c62e400f74e Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:02:13 +0100
Subject: [PATCH 09/15] Revert "Revert aec2fa9..9bdeb5e"

This reverts commit 8d1e03ff7791b3f4fc79846ba8995110d917a174.
---
 angular-ui/angular-ui-router.d.ts | 1 +
 angularjs/angular.d.ts            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 081d35723..889325aa4 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -85,6 +85,7 @@ declare module ng.ui {
         get(state: string): IState;
         get(): IState[];
         current: IState;
+        $current: IState;
         params: IStateParamsService;
         reload(): void;
     }
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index e447985fb..59a33e715 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -337,6 +337,7 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
+        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From d17f3145a523e76a876e6d864c708f2d8cfb4dff Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:03:42 +0100
Subject: [PATCH 10/15] Revert "Revert "Revert aec2fa9..9bdeb5e""

This reverts commit d5ddb0544b0455cf20702f4af36d6c62e400f74e.
---
 angular-ui/angular-ui-router.d.ts | 1 -
 angularjs/angular.d.ts            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 889325aa4..081d35723 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -85,7 +85,6 @@ declare module ng.ui {
         get(state: string): IState;
         get(): IState[];
         current: IState;
-        $current: IState;
         params: IStateParamsService;
         reload(): void;
     }
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 59a33e715..e447985fb 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -337,7 +337,6 @@ declare module ng {
         $new(isolate?: boolean): IScope;
 
         $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): Function;
-        $on(name: string, listener: (event: IAngularEvent, eventArg: any) => any): Function;
 
         $watch(watchExpression: string, listener?: string, objectEquality?: boolean): Function;
         $watch(watchExpression: string, listener?: (newValue: any, oldValue: any, scope: IScope) => any, objectEquality?: boolean): Function;

From 24df639f25cd60e06b47cef6887b151ee6849749 Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:21:54 +0100
Subject: [PATCH 11/15] Add grunt.log.warn method

---
 gruntjs/gruntjs-tests.ts | 43 ++++++++++++++++++++++++++++++++++++++++
 gruntjs/gruntjs.d.ts     |  5 +++++
 2 files changed, 48 insertions(+)

diff --git a/gruntjs/gruntjs-tests.ts b/gruntjs/gruntjs-tests.ts
index 853cac370..fe0f7ace9 100644
--- a/gruntjs/gruntjs-tests.ts
+++ b/gruntjs/gruntjs-tests.ts
@@ -73,3 +73,46 @@ exports = (grunt: IGrunt) => {
     fileMaps[0].src.length;
     fileMaps[0].dest;
 };
+
+// Official grunt task template from 
+// https://github.com/gruntjs/grunt-init-gruntplugin/blob/master/root/tasks/name.js
+exports.exports = function(grunt: IGrunt) {
+
+    // Please see the Grunt documentation for more information regarding task
+    // creation: http://gruntjs.com/creating-tasks
+
+    grunt.registerMultiTask('taskName', 'task description', function() {
+        // Merge task-specific and/or target-specific options with these defaults.
+        var options = this.options({
+            punctuation: '.',
+            separator: ', '
+        });
+
+        // Iterate over all specified file groups.
+        this.files.forEach(function(f) {
+            // Concat specified files.
+            var src = f.src.filter(function(filepath) {
+                // Warn on and remove invalid source files (if nonull was set).
+                if (!grunt.file.exists(filepath)) {
+                    grunt.log.warn('Source file "' + filepath + '" not found.');
+                    return false;
+                } else {
+                    return true;
+                }
+            }).map(function(filepath) {
+                // Read file source.
+                return grunt.file.read(filepath);
+            }).join(grunt.util.normalizelf(options.separator));
+
+            // Handle options.
+            src += options.punctuation;
+
+            // Write the destination file.
+            grunt.file.write(f.dest, src);
+
+            // Print a success message.
+            grunt.log.writeln('File "' + f.dest + '" created.');
+        });
+    });
+
+};
\ No newline at end of file
diff --git a/gruntjs/gruntjs.d.ts b/gruntjs/gruntjs.d.ts
index 86923c56e..8efa08ef6 100644
--- a/gruntjs/gruntjs.d.ts
+++ b/gruntjs/gruntjs.d.ts
@@ -690,6 +690,11 @@ declare module grunt {
              * Log a list of obj properties (good for debugging flags).
              */
             writeflags(obj: any): T
+
+            /**
+             * Log an warning with grunt.log.warn
+             */
+            warn(msg: string): T
         }
 
         /**

From 10c19f9b75e97ba6706da7aaea938ed411a5dcd9 Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:26:17 +0100
Subject: [PATCH 12/15] Revert "Merge branch 'master' of
 https://github.com/martinmcwhorter/DefinitelyTyped"

This reverts commit 00124520f75bdc8151bc2c1427dd8dd5a2404a1b, reversing
changes made to d17f3145a523e76a876e6d864c708f2d8cfb4dff.
---
 angular-ui/angular-ui-router.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/angular-ui/angular-ui-router.d.ts b/angular-ui/angular-ui-router.d.ts
index 889325aa4..081d35723 100644
--- a/angular-ui/angular-ui-router.d.ts
+++ b/angular-ui/angular-ui-router.d.ts
@@ -85,7 +85,6 @@ declare module ng.ui {
         get(state: string): IState;
         get(): IState[];
         current: IState;
-        $current: IState;
         params: IStateParamsService;
         reload(): void;
     }

From 78289250ff3fdfd485eb11d55d133283797b906e Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:28:26 +0100
Subject: [PATCH 13/15] Revert old changes

---
 gruntjs/gruntjs-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gruntjs/gruntjs-tests.ts b/gruntjs/gruntjs-tests.ts
index fe0f7ace9..6807cd96e 100644
--- a/gruntjs/gruntjs-tests.ts
+++ b/gruntjs/gruntjs-tests.ts
@@ -75,6 +75,7 @@ exports = (grunt: IGrunt) => {
 };
 
 // Official grunt task template from 
+// Official grunt task template from
 // https://github.com/gruntjs/grunt-init-gruntplugin/blob/master/root/tasks/name.js
 exports.exports = function(grunt: IGrunt) {
 

From f2d7f68db344ae9b7490523e22caf525f093306c Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 01:29:07 +0100
Subject: [PATCH 14/15] revert bad changes

---
 gruntjs/gruntjs-tests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gruntjs/gruntjs-tests.ts b/gruntjs/gruntjs-tests.ts
index 6807cd96e..5fa560d86 100644
--- a/gruntjs/gruntjs-tests.ts
+++ b/gruntjs/gruntjs-tests.ts
@@ -74,7 +74,6 @@ exports = (grunt: IGrunt) => {
     fileMaps[0].dest;
 };
 
-// Official grunt task template from 
 // Official grunt task template from
 // https://github.com/gruntjs/grunt-init-gruntplugin/blob/master/root/tasks/name.js
 exports.exports = function(grunt: IGrunt) {

From 913218129823ae1659d5d539f5df61d9d277add0 Mon Sep 17 00:00:00 2001
From: martinmcwhorter <martin@mcwhorter.org>
Date: Mon, 4 Aug 2014 15:38:01 +0100
Subject: [PATCH 15/15] added missing type hints

---
 gruntjs/gruntjs-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gruntjs/gruntjs-tests.ts b/gruntjs/gruntjs-tests.ts
index 5fa560d86..6b8607329 100644
--- a/gruntjs/gruntjs-tests.ts
+++ b/gruntjs/gruntjs-tests.ts
@@ -89,9 +89,9 @@ exports.exports = function(grunt: IGrunt) {
         });
 
         // Iterate over all specified file groups.
-        this.files.forEach(function(f) {
+        this.files.forEach(function(f: grunt.file.IFilesConfig) {
             // Concat specified files.
-            var src = f.src.filter(function(filepath) {
+            var src = f.src.filter(function(filepath: string) {
                 // Warn on and remove invalid source files (if nonull was set).
                 if (!grunt.file.exists(filepath)) {
                     grunt.log.warn('Source file "' + filepath + '" not found.');