From f70bcf9a0ef640915ad4324b23396f28e2803ddc Mon Sep 17 00:00:00 2001
From: Christian Kittelmann <soundworker@aol.com>
Date: Tue, 27 Sep 2016 12:54:43 +0200
Subject: [PATCH] vue: fixed definition for activate() in ComponentOption

---
 vue/vue-tests.ts | 5 +++++
 vue/vue.d.ts     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/vue/vue-tests.ts b/vue/vue-tests.ts
index 48d8d91683..a15c3e49c1 100644
--- a/vue/vue-tests.ts
+++ b/vue/vue-tests.ts
@@ -88,6 +88,11 @@ namespace TestGlobalAPI {
     },
     init: function() {}
   });
+  Vue.component("component", {
+    activate: function(callback: Function) {
+      callback();
+    }
+  });
   var transition = Vue.transition("transition");
   Vue.transition("transition", transition);
   Vue.transition("transition", {
diff --git a/vue/vue.d.ts b/vue/vue.d.ts
index a335ee63d1..d65a50da63 100644
--- a/vue/vue.d.ts
+++ b/vue/vue.d.ts
@@ -96,7 +96,7 @@ declare namespace vuejs {
         detached?(): void;
         beforeDestroy?(): void;
         destroyed?(): void;
-        activate?(): void;
+        activate?(callback: Function): void;
         directives?: { [key: string]: (DirectiveOption | Function) };
         elementDirectives?: { [key: string]: (DirectiveOption | Function) };
         filters?: { [key: string]: (Function | FilterOption) };