feature: emitter isntance

psfe · Oct 9, 2016 · c709228 · c709228
1 parent c462b2b
commit c709228
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 171 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+.*.swp
diff --git a/demo/browser/amd.html b/demo/browser/amd.html
@@ -11,15 +11,16 @@
 <body>
   <h2>See the Console</h2>
   <script>
-    require(['MicroEvent'], function(Event) {
-      Event
-        .on('boom!', function(e) {
+    require(['Emitter'], function(Emitter) {
+      var emitter = Emitter();
+
+      emitter.on('boom!', function(e) {
           console.log(e.type, e.timeStamp);
         })
         .trigger('boom!')
-        .trigger(new Event('boom!'));
+        .trigger(new Emitter.Event('boom!'));
 
-      Event
+      emitter
         .on('ha!', function(e, foo, bar) {
           console.log(e.type, foo, bar);
         })

diff --git a/demo/browser/global.html b/demo/browser/global.html
@@ -10,16 +10,16 @@
 <body>
   <h2>See the Console</h2>
   <script>
-    var Event = window.MicroEvent;
+    var emitter = window.Emitter();
 
-    Event
+    emitter
       .on('boom!', function(e) {
         console.log(e.type, e.timeStamp);
       })
       .trigger('boom!')
-      .trigger(new Event('boom!'));
+      .trigger(new window.Emitter.Event('boom!'));
 
-    Event
+    emitter
       .on('ha!', function(e, foo, bar) {
         console.log(e.type, foo, bar);
       })

diff --git a/demo/node/index.js b/demo/node/index.js
@@ -1,13 +1,14 @@
-var Event = require('../..');
+var Emitter = require('../..');
+var emitter = Emitter();
 
-Event
+emitter
     .on('boom!', function(e){
         console.log(e.type, e.timeStamp);
     })
     .trigger('boom!')
-    .trigger(new Event('boom!'));
+    .trigger(new Emitter.Event('boom!'));
 
-Event
+emitter
     .on('ha!', function(e, foo, bar){
         console.log(e.type, foo, bar);
     })

diff --git a/dist/micro-event.js b/dist/micro-event.js
@@ -1,83 +0,0 @@
-'use strict';
-
-(function () {
-    var events = {};
-
-    function Event(type) {
-        this.type = type;
-        this.timeStamp = new Date();
-    }
-
-    Event.on = function (type, handler) {
-        if (events.hasOwnProperty(type)) {
-            events[type].push(handler);
-        } else {
-            events[type] = [handler];
-        }
-        return Event;
-    };
-
-    Event.off = function (type, handler) {
-        if (arguments.length === 0) {
-            return _offAll();
-        }
-        if (handler === undefined) {
-            return _offByType(type);
-        }
-        return _offByHandler(type, handler);
-    };
-
-    Event.trigger = function (event, args) {
-        if (!(event instanceof Event)) {
-            event = new Event(event);
-        }
-        return _dispatch(event, args);
-    };
-
-    function _dispatch(event, args) {
-        if (!events.hasOwnProperty(event.type)) return;
-        args = args || [];
-        args.unshift(event);
-
-        var handlers = events[event.type] || [];
-        handlers.forEach(function (handler) {
-            return handler.apply(null, args);
-        });
-        return Event;
-    }
-
-    function _offByHandler(type, handler) {
-        if (!events.hasOwnProperty(type)) return;
-        var i = events[type].indexOf(handler);
-        if (i > -1) {
-            events[type].splice(i, 1);
-        }
-        return Event;
-    }
-
-    function _offByType(type) {
-        if (events.hasOwnProperty(type)) {
-            delete events[type];
-        }
-        return Event;
-    }
-
-    function _offAll() {
-        events = {};
-        return Event;
-    }
-
-    // CommonJS
-    if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
-        module.exports = Event;
-    }
-    // Browser
-    else if (typeof define === 'function' && define.amd) {
-            define('MicroEvent', [], function () {
-                return Event;
-            });
-        } else {
-            window.MicroEvent = Event;
-        }
-})();
-

diff --git a/dist/micro-event.min.js b/dist/micro-event.min.js
diff --git a/index.js b/index.js
@@ -1,79 +1,95 @@
 (function() {
-    var events = {};
+    function Emitter() {
+        var e = Object.create(emitter);
+        e.events = {};
+        return e;
+    }
 
     function Event(type) {
         this.type = type;
         this.timeStamp = new Date();
     }
 
-    Event.on = function(type, handler) {
-        if (events.hasOwnProperty(type)) {
-            events[type].push(handler);
+    var emitter = {};
+
+    emitter.on = function(type, handler) {
+        if (this.events.hasOwnProperty(type)) {
+            this.events[type].push(handler);
         } else {
-            events[type] = [handler];
+            this.events[type] = [handler];
         }
-        return Event;
+        return this;
     };
 
-    Event.off = function(type, handler) {
+    emitter.off = function(type, handler) {
         if (arguments.length === 0) {
-            return _offAll();
+            return this._offAll();
         }
         if (handler === undefined) {
-            return _offByType(type);
+            return this._offByType(type);
         }
-        return _offByHandler(type, handler);
+        return this._offByHandler(type, handler);
     };
 
-    Event.trigger = function(event, args) {
+    emitter.trigger = function(event, args) {
         if (!(event instanceof Event)) {
             event = new Event(event);
         }
-        return _dispatch(event, args);
+        return this._dispatch(event, args);
     };
 
-    function _dispatch(event, args) {
-        if (!events.hasOwnProperty(event.type)) return;
+    emitter._dispatch = function(event, args) {
+        if (!this.events.hasOwnProperty(event.type)) return;
         args = args || [];
         args.unshift(event);
 
-        var handlers = events[event.type] || [];
+        var handlers = this.events[event.type] || [];
         handlers.forEach(handler => handler.apply(null, args));
-        return Event;
-    }
+        return this;
+    };
 
-    function _offByHandler(type, handler) {
-        if (!events.hasOwnProperty(type)) return;
-        var i = events[type].indexOf(handler);
+    emitter._offByHandler = function(type, handler) {
+        if (!this.events.hasOwnProperty(type)) return;
+        var i = this.events[type].indexOf(handler);
         if (i > -1) {
-            events[type].splice(i, 1);
+            this.events[type].splice(i, 1);
         }
-        return Event;
-    }
+        return this;
+    };
 
-    function _offByType(type) {
-        if (events.hasOwnProperty(type)) {
-            delete events[type];
+    emitter._offByType = function(type) {
+        if (this.events.hasOwnProperty(type)) {
+            delete this.events[type];
         }
-        return Event;
-    }
+        return this;
+    };
 
-    function _offAll() {
-        events = {};
-        return Event;
-    }
+    emitter._offAll = function() {
+        this.events = {};
+        return this;
+    };
 
+    Emitter.Event = Event;
+
+    Emitter.mixin = function(obj, arr){
+        var emitter = new Emitter();
+        arr.map(function(name){
+            obj[name] = function(){
+                return emitter[name].apply(emitter, arguments);
+            };
+        });
+    };
 
     // CommonJS
     if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
-        module.exports = Event;
+        module.exports = Emitter;
     }
     // Browser
     else if (typeof define === 'function' && define.amd) {
-        define('MicroEvent', [], function() {
-            return Event;
+        define('Emitter', [], function() {
+            return Emitter;
         });
     } else {
-        window.MicroEvent = Event;
+        window.Emitter = Emitter;
     }
 })();
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "micro-event",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A JavaScript Event Emmiter for Node.js and Browsers",
   "main": "index.js",
   "scripts": {