@lijuhong1981/jsevents 1.1.1 → 1.1.3

package/index.js

@@ -1,9 +1,9 @@
 import EventDispatcher from "./src/EventDispatcher.js";
 import EventEmitter from "./src/EventEmitter.js";
-import EventRaiser from "./src/EventRaiser.js";
+import EventSubscriber from "./src/EventSubscriber.js";
 
 export {
     EventDispatcher,
     EventEmitter,
-    EventRaiser,
+    EventSubscriber,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsevents",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "> TODO: description",
   "author": "lijuhong1981",
   "homepage": "https://github.com/lijuhong1981/jslibs#readme",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@lijuhong1981/jscheck": "^1.0.9",
-    "@lijuhong1981/jsdestroy": "^1.1.7"
+    "@lijuhong1981/jsdestroy": "^1.1.8"
   },
-  "gitHead": "a9d2c98fdcce71031b0e4e9c2fabdaab688c7c48"
+  "gitHead": "611e658c8c0e2b72dbea60cbcd50ec6dc2d0b497"
 }

package/src/EventDispatcher.js

@@ -109,7 +109,7 @@ class EventDispatcher extends Destroyable {
      * @param {String|Object} type 事件类型
      * @returns {Number} 监听器数量
      */
-    getEventListenersNumber(type) {
+    getEventListenersCount(type) {
         Check.valid('type', type);
 
         const listeners = this._listenersMap.get(type);
@@ -195,12 +195,10 @@ class EventDispatcher extends Destroyable {
     }
 
     /**
-     * 销毁
-     * @returns {this}
+     * 执行销毁
      */
-    destroy() {
+    onDestroy() {
         this.clear();
-        return super.destroy();
     }
 };
 

package/src/EventEmitter.js

@@ -56,8 +56,8 @@ class EventEmitter extends Destroyable {
      * @param {String|Object} type 事件类型
      * @returns {Number} 监听器数量
      */
-    listenersNumber() {
-        return this._dispatcher.getEventListenersNumber(type);
+    listenersCount(type) {
+        return this._dispatcher.getEventListenersCount(type);
     }
 
     /**
@@ -86,18 +86,16 @@ class EventEmitter extends Destroyable {
      * @param {Object} owner 事件对象所有者，可不填
      * @returns {this}
      */
-    emitEvent(event) {
-        this._dispatcher.dispatchEvent(event);
+    emitEvent(event, owner) {
+        this._dispatcher.dispatchEvent(event, owner);
         return this;
     }
 
     /**
-     * 销毁
-     * @returns {this}
+     * 执行销毁
      */
-    destroy() {
+    onDestroy() {
         this._dispatcher.destroy();
-        return super.destroy();
     }
 };
 

package/src/{EventRaiser.js → EventSubscriber.js}

@@ -1,10 +1,14 @@
 import Check from "@lijuhong1981/jscheck/src/Check.js";
 import Destroyable from "@lijuhong1981/jsdestroy/src/Destroyable.js";
 
-class EventRaiser extends Destroyable {
+/**
+ * A generic utility class for managing subscribers for a particular event. This class is usually instantiated inside of a container class and exposed as a property for others to subscribe to.
+*/
+class EventSubscriber extends Destroyable {
     constructor() {
         super();
         this._listeners = [];
+        this._listenersMap = new Map();
     }
 
     /**
@@ -20,13 +24,8 @@ class EventRaiser extends Destroyable {
      * @param {Function} callback 事件监听回调函数
      * @returns {Boolean}
      */
-    hasListener(callback) {
-        for (let i = 0, length = this._listeners.length; i < length; i++) {
-            if (this._listeners[i].callback === callback) {
-                return true;
-            }
-        }
-        return false;
+    hasEventListener(callback) {
+        return this._listenersMap.has(callback);
     }
 
     /**
@@ -37,26 +36,23 @@ class EventRaiser extends Destroyable {
      * @param {Boolean} options.once 是否单次事件，可不填
      * @returns {Function} 移除函数，调用该函数可直接移除事件监听
      */
-    addListener(callback, options = {}) {
+    addEventListener(callback, options = {}) {
         Check.typeOf.func('callback', callback);
 
-        let listener;
-        for (let i = 0, length = this._listeners.length; i < length; i++) {
-            if (this._listeners[i].callback === callback) {
-                listener = this._listeners[i];
-                break;
-            }
-        }
+        let listener = this._listenersMap.get(callback);
 
         if (!listener) {
             listener = {
                 callback: callback,
                 options: options,
                 removeFunc: () => {
-                    this.removeListener(callback);
+                    this.removeEventListener(callback);
                 }
             };
             this._listeners.push(listener);
+            this._listenersMap.set(callback, listener);
+        } else {
+            listener.options = options;
         }
 
         return listener.removeFunc;
@@ -67,12 +63,13 @@ class EventRaiser extends Destroyable {
      * @param {Function} callback 回调函数
      * @returns {this}
      */
-    removeListener(callback) {
+    removeEventListener(callback) {
         Check.typeOf.func('callback', callback);
 
         for (let i = 0, length = this._listeners.length; i < length; i++) {
             if (this._listeners[i].callback === callback) {
                 this._listeners.splice(i, 1);
+                this._listenersMap.delete(callback);
                 break;
             }
         }
@@ -86,6 +83,7 @@ class EventRaiser extends Destroyable {
      */
     clear() {
         this._listeners.length = 0;
+        this._listenersMap.clear();
         return this;
     }
 
@@ -108,13 +106,11 @@ class EventRaiser extends Destroyable {
     }
 
     /**
-     * 销毁
-     * @returns {this}
+     * 执行销毁
      */
-    destroy() {
+    onDestroy() {
         this.clear();
-        return super.destroy();
     }
 };
 
-export default EventRaiser;
+export default EventSubscriber;