From 6448efc226384a885feee9cb8f6fa03f4e88cd68 Mon Sep 17 00:00:00 2001
From: Kaoru Hagihara <hagiharak65536@gmail.com>
Date: Sun, 6 Mar 2016 01:21:41 +0900
Subject: [PATCH] fix vue-router

fix namespace
---
 vue-router/vue-router-tests.ts | 28 +++++++++++-----------------
 vue-router/vue-router.d.ts     | 12 +++++-------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/vue-router/vue-router-tests.ts b/vue-router/vue-router-tests.ts
index 2a75768fbc..12588db47d 100644
--- a/vue-router/vue-router-tests.ts
+++ b/vue-router/vue-router-tests.ts
@@ -8,8 +8,15 @@ namespace TestBasic {
     var Foo = Vue.extend({
         template: "<p>This is foo!</p>",
         route: {
-            canActivate(transition: vuerouter.Transition<any, any, any, any, any>) {
+            canActivate(transition: vuejs.Transition<any, any, any, any, any>) {
                 return true;
+            },
+            activate: function() {
+                var p: PromiseLike<any>;
+                return p;
+            },
+            deactivate: function(transition: vuejs.Transition<any, any, any, any, any>) {
+                transition.next();
             }
         }
     });
@@ -43,7 +50,7 @@ namespace TestAdvanced {
 
     namespace App {
 
-        export class App {
+        export class App extends Vue {
             authenticating: boolean;
 
             data() {
@@ -55,25 +62,12 @@ namespace TestAdvanced {
     }
 
     namespace Inbox {
-        export class Index {
-            static route: vuerouter.TransitionHook<App.App, any, any, { id: number }, any> = {
-                canActivate: function(transition) {
-                    var n: number = transition.to.params.id;
-                    transition.next();
-                },
-                activate: function() {
-                    var p: PromiseLike<any>;
-                    return p;
-                },
-                deactivate: function({next}) {
-                    next();
-                }
-            };
+        export class Index extends Vue {
         }
     }
 
     namespace RouteConfig {
-        export function configRouter(router: vuerouter.Router<App.App>) {
+        export function configRouter(router: vuejs.Router<App.App>) {
             router.map({
                 "/about": {
                     component: {},
diff --git a/vue-router/vue-router.d.ts b/vue-router/vue-router.d.ts
index 05bd2a762e..3c5c291cc4 100644
--- a/vue-router/vue-router.d.ts
+++ b/vue-router/vue-router.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../vue/vue.d.ts" />
 
-declare namespace vuerouter {
+declare namespace vuejs {
 
     interface Transition<RootVueApp, FromParams, FromQuery, ToParams, ToQuery> {
         from: $route<RootVueApp, FromParams, FromQuery>;
@@ -71,20 +71,18 @@ declare namespace vuerouter {
         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>;
-        $router?: vuerouter.Router<any>;
+        $route: vuejs.$route<any, any, any>;
+        $router: vuejs.Router<any>;
     }
 
     interface ComponentOption {
-        route?: vuerouter.TransitionHook<any, any, any, any, any>;
+        route?: vuejs.TransitionHook<any, any, any, any, any>;
     }
 }
 
-declare var VueRouter: vuerouter.RouterStatic;
+declare var VueRouter: vuejs.RouterStatic;
 
 declare module "vue-router" {
     export = VueRouter;