wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7978 from kaorun343/vue-router

Browse Source 
update vue-router.d.ts to 0.7.10
This commit is contained in:
Masahiro Wakame
2016-02-07 02:13:46 +09:00
parent fc37af98aa 0146caf10c
commit 138728fd0a
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vue-router/vue-router-tests.ts
+2 -3
View File
@@ -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();
vue-router/vue-router.d.ts
Vendored
+8 -8
View File
@@ -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 {