From 0146caf10cf880cd83c311862cc65862b9cb919b Mon Sep 17 00:00:00 2001
From: Kaoru Hagihara <hagiharak65536@gmail.com>
Date: Fri, 5 Feb 2016 11:00:20 +0900
Subject: [PATCH] update vue-router.d.ts to 0.7.10

---
 vue-router/vue-router-tests.ts |  5 ++---
 vue-router/vue-router.d.ts     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/vue-router/vue-router-tests.ts b/vue-router/vue-router-tests.ts
index b0fc1b511..2a75768fb 100644
--- a/vue-router/vue-router-tests.ts
+++ b/vue-router/vue-router-tests.ts
@@ -62,9 +62,8 @@ namespace TestAdvanced {
                     transition.next();
                 },
                 activate: function() {
-                    return new Promise((resolve) => {
-                        resolve();
-                    });
+                    var p: PromiseLike<any>;
+                    return p;
                 },
                 deactivate: function({next}) {
                     next();
diff --git a/vue-router/vue-router.d.ts b/vue-router/vue-router.d.ts
index 97f31c922..05bd2a762 100644
--- a/vue-router/vue-router.d.ts
+++ b/vue-router/vue-router.d.ts
@@ -1,10 +1,9 @@
-// Type definitions for vue-router 0.7.7
+// Type definitions for vue-router 0.7.10
 // Project: https://github.com/vuejs/vue-router
 // Definitions by: kaorun343 <https://github.com/kaorun343>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../vue/vue.d.ts" />
-/// <reference path="../es6-promise/es6-promise.d.ts" />
 
 declare namespace vuerouter {
 
@@ -65,18 +64,19 @@ declare namespace vuerouter {
     }
 
     interface TransitionHook<Root, FP, FQ, TP, TQ> {
-        data?(transition?: Transition<Root, FP, FQ, TP, TQ>): Thenable<any> | void;
-        activate?(transition?: Transition<Root, FP, FQ, TP, TQ>): Thenable<any> | void;
-        deactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): Thenable<any> | void;
-        canActivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): Thenable<any> | boolean | void;
-        canDeactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): Thenable<any> | boolean | void;
+        data?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
+        activate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
+        deactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | void;
+        canActivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | boolean | void;
+        canDeactivate?(transition?: Transition<Root, FP, FQ, TP, TQ>): PromiseLike<any> | boolean | void;
         canReuse?: boolean | ((transition: Transition<Root, FP, FQ, TP, TQ>) => boolean);
     }
 }
 
 declare namespace vuejs {
     interface Vue {
-        $route: vuerouter.$route<any, any, any>;
+        $route?: vuerouter.$route<any, any, any>;
+        $router?: vuerouter.Router<any>;
     }
 
     interface ComponentOption {