From a75d944311e8949d73f396c5c2902c30d19467b2 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Thu, 15 May 2014 20:25:26 +0200
Subject: [PATCH] Allow custom events and do not collect events from methods

---
 apidoc/plugins/events.js         |  8 ++------
 apidoc/template/tmpl/method.tmpl | 23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/apidoc/plugins/events.js b/apidoc/plugins/events.js
index 741ea88965..c28ea2035b 100644
--- a/apidoc/plugins/events.js
+++ b/apidoc/plugins/events.js
@@ -29,15 +29,11 @@ exports.handlers = {
             event = doclet.fires[j].replace('event:', '');
             if (events[event]) {
               fires.push.apply(fires, events[event]);            
+            } else {
+              fires.push(doclet.fires[j]);
             }
           }
           doclet.fires = fires;
-        } else {
-          eventClass = classes[doclet.longname.split('#')[0]];
-          if (!eventClass.fires) {
-            eventClass.fires = [];
-          }
-          eventClass.fires.push.apply(eventClass.fires, doclet.fires);
         }
       }
     }
diff --git a/apidoc/template/tmpl/method.tmpl b/apidoc/template/tmpl/method.tmpl
index c8ff2ee5e3..fab22c754c 100644
--- a/apidoc/template/tmpl/method.tmpl
+++ b/apidoc/template/tmpl/method.tmpl
@@ -57,18 +57,27 @@ var self = this;
     <h5>Fires:</h5>
     <ul><?js fires.forEach(function(f) {
             var parts = f.split(/#?event:/);
+            var type = parts.pop();
+            var eventClassName = parts[0];
+            parts = type.split(' ');
+            type = parts.shift();
+            var description = parts.length ? parts.join(' ') : '';
+            var eventDoclet = self.find({longname: f})[0];
+            if (eventDoclet && !description && eventDoclet.description) {
+              description = eventDoclet.description.replace(/<[^>]*>/g, '');
+            }
         ?>
-        <li><?js var eventDoclet = self.find({longname: f})[0]; ?>
-            <code><?js= self.linkto(f, parts[1]) ?></code>
-            <?js if (parts[0]) {
-              var eventClass = self.find({longname: parts[0]})[0];
+        <li>
+            <code><?js= self.linkto(f, type) ?></code>
+            <?js if (eventClassName) {
+              var eventClass = self.find({longname: eventClassName})[0];
               if (eventClass) { ?>
                 (<?js= self.linkto(eventClass.longname) ?>)
               <?js } ?>
             <?js } ?>
-            <?js if (eventDoclet && eventDoclet.description) { ?> -
-            <?js= (eventDoclet ? self.partial('stability.tmpl', eventDoclet) : '') ?>
-            <?js= eventDoclet.description.replace(/<[^>]*>/g, '') ?>
+            <?js if (description) { ?> -
+            <?js= self.partial('stability.tmpl', eventDoclet || (data.stability ? data : {stability: 'experimental'})) ?>
+            <?js= description ?>
             <?js } ?>
         </li>
     <?js }); ?></ul>