Fix chieffancypants#101: Prevents propagation when callback returns f…

…alse. Inspired by PR chieffancypants#39
leyanlo · Jun 9, 2016 · 7cbd0fe · 7cbd0fe
1 parent 0725137
commit 7cbd0fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/build/hotkeys.js b/build/hotkeys.js
@@ -422,7 +422,7 @@
             }
 
             if (shouldExecute) {
-              wrapApply(_callback.apply(this, arguments));
+              return _callback.apply(this, arguments);
             }
           };
         }
@@ -570,9 +570,9 @@
 
           // this takes place outside angular, so we'll have to call
           // $apply() to make sure angular's digest happens
-          $rootScope.$apply(function() {
+          return $rootScope.$apply(function() {
             // call the original hotkey callback with the keyboard event
-            callback(event, _get(combo));
+            return callback(event, _get(combo));
           });
         };
       }
@@ -911,14 +911,14 @@
     }
 
     /**
-     * stops propogation for this event
+     * stops immediate propagation for this event
      *
      * @param {Event} e
      * @returns void
      */
-    function _stopPropagation(e) {
-        if (e.stopPropagation) {
-            e.stopPropagation();
+    function _stopImmediatePropagation(e) {
+        if (e.stopImmediatePropagation) {
+            e.stopImmediatePropagation();
             return;
         }
 
@@ -1244,7 +1244,7 @@
 
             if (callback(e, combo) === false) {
                 _preventDefault(e);
-                _stopPropagation(e);
+                _stopImmediatePropagation(e);
             }
         }
 

diff --git a/src/hotkeys.js b/src/hotkeys.js
@@ -416,7 +416,7 @@
             }
 
             if (shouldExecute) {
-              wrapApply(_callback.apply(this, arguments));
+              return _callback.apply(this, arguments);
             }
           };
         }
@@ -564,9 +564,9 @@
 
           // this takes place outside angular, so we'll have to call
           // $apply() to make sure angular's digest happens
-          $rootScope.$apply(function() {
+          return $rootScope.$apply(function() {
             // call the original hotkey callback with the keyboard event
-            callback(event, _get(combo));
+            return callback(event, _get(combo));
           });
         };
       }