released v3.4.0 #44

jaywcjlove · Nov 21, 2018 · 50c8457 · 50c8457
1 parent fe2dd3c
commit 50c8457
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/dist/hotkeys.common.js b/dist/hotkeys.common.js
@@ -1,5 +1,5 @@
 /*!
- * hotkeys-js v3.3.8
+ * hotkeys-js v3.4.0
  * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies.
  * 
  * Copyright (c) 2018 kenny wong <wowohoo@qq.com>
@@ -208,11 +208,17 @@ function clearModifier(event) {
 }
 
 // 解除绑定某个范围的快捷键
-function unbind(key, scope) {
+function unbind(key, scope, method) {
   var multipleKeys = getKeys(key);
   var keys = void 0;
   var mods = [];
   var obj = void 0;
+  // 通过函数判断，是否解除绑定
+  // https://github.com/jaywcjlove/hotkeys/issues/44
+  if (typeof scope === 'function') {
+    method = scope;
+    scope = 'all';
+  }
 
   for (var i = 0; i < multipleKeys.length; i++) {
     // 将组合快捷键拆分为数组
@@ -235,6 +241,8 @@ function unbind(key, scope) {
     // 让触发快捷键键之后没有事件执行到达解除快捷键绑定的目的
     for (var r = 0; r < _handlers[key].length; r++) {
       obj = _handlers[key][r];
+      // 通过函数判断，是否解除绑定，函数相等直接返回
+      if (method && obj.method !== method) return;
       // 判断是否在范围内并且键值相同
       if (obj.scope === scope && compareArray(obj.mods, mods)) {
         _handlers[key][r] = {};

diff --git a/dist/hotkeys.common.min.js b/dist/hotkeys.common.min.js
diff --git a/dist/hotkeys.esm.js b/dist/hotkeys.esm.js
@@ -1,5 +1,5 @@
 /*!
- * hotkeys-js v3.3.8
+ * hotkeys-js v3.4.0
  * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies.
  * 
  * Copyright (c) 2018 kenny wong <wowohoo@qq.com>
@@ -206,11 +206,17 @@ function clearModifier(event) {
 }
 
 // 解除绑定某个范围的快捷键
-function unbind(key, scope) {
+function unbind(key, scope, method) {
   var multipleKeys = getKeys(key);
   var keys = void 0;
   var mods = [];
   var obj = void 0;
+  // 通过函数判断，是否解除绑定
+  // https://github.com/jaywcjlove/hotkeys/issues/44
+  if (typeof scope === 'function') {
+    method = scope;
+    scope = 'all';
+  }
 
   for (var i = 0; i < multipleKeys.length; i++) {
     // 将组合快捷键拆分为数组
@@ -233,6 +239,8 @@ function unbind(key, scope) {
     // 让触发快捷键键之后没有事件执行到达解除快捷键绑定的目的
     for (var r = 0; r < _handlers[key].length; r++) {
       obj = _handlers[key][r];
+      // 通过函数判断，是否解除绑定，函数相等直接返回
+      if (method && obj.method !== method) return;
       // 判断是否在范围内并且键值相同
       if (obj.scope === scope && compareArray(obj.mods, mods)) {
         _handlers[key][r] = {};

diff --git a/dist/hotkeys.js b/dist/hotkeys.js
@@ -1,5 +1,5 @@
 /*!
- * hotkeys-js v3.3.8
+ * hotkeys-js v3.4.0
  * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies.
  * 
  * Copyright (c) 2018 kenny wong <wowohoo@qq.com>
@@ -212,11 +212,17 @@
   }
 
   // 解除绑定某个范围的快捷键
-  function unbind(key, scope) {
+  function unbind(key, scope, method) {
     var multipleKeys = getKeys(key);
     var keys = void 0;
     var mods = [];
     var obj = void 0;
+    // 通过函数判断，是否解除绑定
+    // https://github.com/jaywcjlove/hotkeys/issues/44
+    if (typeof scope === 'function') {
+      method = scope;
+      scope = 'all';
+    }
 
     for (var i = 0; i < multipleKeys.length; i++) {
       // 将组合快捷键拆分为数组
@@ -239,6 +245,8 @@
       // 让触发快捷键键之后没有事件执行到达解除快捷键绑定的目的
       for (var r = 0; r < _handlers[key].length; r++) {
         obj = _handlers[key][r];
+        // 通过函数判断，是否解除绑定，函数相等直接返回
+        if (method && obj.method !== method) return;
         // 判断是否在范围内并且键值相同
         if (obj.scope === scope && compareArray(obj.mods, mods)) {
           _handlers[key][r] = {};