@lijuhong1981/jsevents 1.1.14 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsevents",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "> TODO: description",
   "author": "lijuhong1981 <lijuhong@hotmail.com>",
   "homepage": "https://github.com/lijuhong1981/jslibs#readme",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@lijuhong1981/jscheck": "^1.0.14",
-    "@lijuhong1981/jsdestroy": "^1.1.12"
+    "@lijuhong1981/jsdestroy": "^1.1.13"
   },
-  "gitHead": "61a568d529682a0c657b5d130655c293d5dcab58"
+  "gitHead": "9291cfb2a4fb79f028630a3f52804a0b0e00aa0f"
 }

package/src/EventDispatcher.js

@@ -65,15 +65,14 @@ class EventDispatcher extends Destroyable {
         Check.valid('type', type);
         Check.typeOf.func('callback', callback);
 
-        if (isString(type) && type.match(/\s+/)) {
+        if (isString(type) && type.match(/\s+/))
             type = type.split(/\s+/);
-        }
 
-        if (isArray(type)) {
+        if (isArray(type))
             type.forEach(element => {
                 addListener(this._events, element, callback, options);
             });
-        } else
+        else
             addListener(this._events, type, callback, options);
 
         return this;
@@ -88,20 +87,32 @@ class EventDispatcher extends Destroyable {
     removeEventListener(type, callback) {
         Check.valid('type', type);
 
-        if (isString(type) && type.match(/\s+/)) {
+        if (isString(type) && type.match(/\s+/))
             type = type.split(/\s+/);
-        }
 
-        if (isArray(type)) {
+        if (isArray(type))
             type.forEach(element => {
                 removeListener(this._events, element, callback);
             });
-        } else
+        else
             removeListener(this._events, type, callback);
 
         return this;
     }
 
+    /**
+     * 移除所有事件监听
+     * @returns {this}
+     */
+    removeAllEventListeners() {
+        this._events.forEach(function (event) {
+            event.destroy();
+        });
+        this._events.clear();
+
+        return this;
+    }
+
     /**
      * 注册的事件数量
      * @returns {number}
@@ -137,16 +148,15 @@ class EventDispatcher extends Destroyable {
     }
 
     /**
-     * 清除所有事件监听
-     * @returns {this}
+     * 获取某类型的所有事件监听器
+     * @param {any} type
+     * @returns {Array<Function>}
      */
-    clear() {
-        this._events.forEach(function (event, type) {
-            event.destroy();
-        });
-        this._events.clear();
+    getEventListeners(type) {
+        Check.valid('type', type);
 
-        return this;
+        const event = this._events.get(type);
+        return event && event.listeners;
     }
 
     /**
@@ -160,7 +170,7 @@ class EventDispatcher extends Destroyable {
 
         const _event = this._events.get(type);
         if (_event)
-            _event.raiseEvent(type, ...args);
+            _event.raiseEvent(...args);
         // else {
         //     console.warn('Not found the type`s event.', type);
         // }
@@ -179,7 +189,8 @@ class EventDispatcher extends Destroyable {
         Check.typeOf.object('event', event);
         Check.valid('event.type', event.type);
 
-        event.owner = event.owner || owner || this;
+        if (!event.owner)
+            event.owner = owner || this;
 
         const _event = this._events.get(event.type);
         if (_event)
@@ -195,7 +206,7 @@ class EventDispatcher extends Destroyable {
      * 执行销毁
      */
     onDestroy() {
-        this.clear();
+        this.removeAllEventListeners();
     }
 };
 

package/src/EventEmitter.js

@@ -16,20 +16,29 @@ class EventEmitter extends Destroyable {
      * @param {boolean} options.once 是否单次事件，可不填
      * @returns {this}
      */
-    on(type, callback, options) {
+    addListener(type, callback, options) {
         this._dispatcher.addEventListener(type, callback, options);
         return this;
     }
 
+    /**
+     * @see addListener
+    */
+    on(type, callback, options) {
+        return this.addListener(type, callback, options);
+    }
+
     /**
      * 添加单次事件监听
      * @param {any} type 事件类型
      * @param {Function} callback 回调函数
      * @param {object} scope 回调函数<code>this</code>指针对象，可不填
      * @returns {this}
+     * 
+     * @see addListener
      */
     once(type, callback, scope) {
-        this._dispatcher.addEventListener(type, callback, {
+        this.addListener(type, callback, {
             once: true,
             scope: scope,
         });
@@ -42,11 +51,27 @@ class EventEmitter extends Destroyable {
      * @param {Function} callback 回调函数，不填时可移除type下所有的事件监听
      * @returns {this}
      */
-    off(type, callback) {
+    removeListener(type, callback) {
         this._dispatcher.removeEventListener(type, callback);
         return this;
     }
 
+    /**
+     * @see removeListener
+    */
+    off(type, callback) {
+        return this.removeListener(type, callback);
+    }
+
+    /**
+     * 移除所有事件监听
+     * @returns {this}
+     */
+    removeAllListeners() {
+        this._dispatcher.removeAllEventListeners();
+        return this;
+    }
+
     /**
      * 判断是否已添加某类型的事件监听
      * @param {any} type 事件类型
@@ -56,6 +81,15 @@ class EventEmitter extends Destroyable {
         return this._dispatcher.hasEventListener(type);
     }
 
+    /**
+     * 获取某类型的所有事件监听器
+     * @param {any} type
+     * @returns {Array<Function>}
+     */
+    getListeners(type) {
+        return this._dispatcher.getEventListeners(type);
+    }
+
     /**
      * 注册的事件数量
      * @returns {number}
@@ -73,15 +107,6 @@ class EventEmitter extends Destroyable {
         return this._dispatcher.numberOfListeners(type);
     }
 
-    /**
-     * 清除所有事件监听
-     * @returns {this}
-     */
-    clear() {
-        this._dispatcher.clear();
-        return this;
-    }
-
     /**
      * 发送事件参数
      * @param {any} type 事件类型
@@ -100,7 +125,7 @@ class EventEmitter extends Destroyable {
      * @returns {this}
      */
     emitEvent(event, owner) {
-        this._dispatcher.dispatchEvent(event, owner);
+        this._dispatcher.dispatchEvent(event, owner || this);
         return this;
     }
 

package/src/EventSubscriber.js

@@ -18,6 +18,19 @@ class EventSubscriber extends Destroyable {
         return this._listenersMap.size;
     }
 
+    /**
+     * 获取所有的事件监听器
+     * @returns {Array<Function>}
+     */
+    get listeners() {
+        const result = [];
+        const listeners = this._listenersMap.values();
+        for (const listener of listeners) {
+            result.push(listener.callback);
+        }
+        return result;
+    }
+
     /**
      * 判断事件监听器是否已存在
      * @param {Function} callback 事件监听回调函数