0.3.13

Novatrox · May 3, 2016 · 3661e23 · 3661e23
1 parent 05ecbfb
commit 3661e23
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 50 deletions.
diff --git a/dist/amd/akp-event-handler.js b/dist/amd/akp-event-handler.js
@@ -97,13 +97,17 @@ define(['exports', 'aurelia-framework', 'aurelia-pal', './akp-configuration', 'm
 			if (triggerContext) {
 				var mouseTrap = new Mousetrap(triggerContext);
 				mouseTrap.bind(key, function (e) {
-					if (preventDefault) {
-						e.preventDefault();
-					}
+
 					var res = callback({ args: e });
 					if (res !== undefined && typeof res === 'boolean') {
+						if (!res && preventDefault) {
+							e.preventDefault();
+						}
 						return res;
+					} else if (preventDefault) {
+						e.preventDefault();
 					}
+					return true;
 				});
 			} else {
 				(function () {
@@ -114,14 +118,16 @@ define(['exports', 'aurelia-framework', 'aurelia-pal', './akp-configuration', 'm
 						if (!self.checkBlocks(context)) {
 							return false;
 						}
-
-						if (preventDefault) {
-							e.preventDefault();
-						}
 						var res = callback({ args: e });
 						if (res !== undefined && typeof res === 'boolean') {
+							if (!res && preventDefault) {
+								e.preventDefault();
+							}
 							return res;
+						} else if (preventDefault) {
+							e.preventDefault();
 						}
+						return true;
 					});
 				})();
 			}

diff --git a/dist/aurelia-keyboard-plugin.js b/dist/aurelia-keyboard-plugin.js
@@ -75,13 +75,18 @@ export class AKPEventHandler {
 			//only trigger inside context
 			let mouseTrap = new Mousetrap(triggerContext);
 			mouseTrap.bind(key, function(e) {
-				if (preventDefault) {
-					e.preventDefault();
-				}
+
 				var res = callback({args: e});
 				if(res !== undefined && typeof res === 'boolean') {
+					if(!res && preventDefault) {						
+						e.preventDefault();
+					}					
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
+
 			});
 		}  else {
 			this.registeredKeys.push(new KeyEvent(key, callback, preventDefault));
@@ -91,14 +96,16 @@ export class AKPEventHandler {
 				if(!self.checkBlocks(context)) {
 					return false;
 				}
-
-				if (preventDefault) {
-					e.preventDefault();
-				}
 				var res = callback({args: e});
 				if(res !== undefined && typeof res === 'boolean') {
+					if(!res && preventDefault) {						
+						e.preventDefault();
+					}					
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
 			});
 		}
 	}

diff --git a/dist/commonjs/akp-event-handler.js b/dist/commonjs/akp-event-handler.js
@@ -85,13 +85,17 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
 		if (triggerContext) {
 			var mouseTrap = new Mousetrap(triggerContext);
 			mouseTrap.bind(key, function (e) {
-				if (preventDefault) {
-					e.preventDefault();
-				}
+
 				var res = callback({ args: e });
 				if (res !== undefined && typeof res === 'boolean') {
+					if (!res && preventDefault) {
+						e.preventDefault();
+					}
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
 			});
 		} else {
 			(function () {
@@ -102,14 +106,16 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
 					if (!self.checkBlocks(context)) {
 						return false;
 					}
-
-					if (preventDefault) {
-						e.preventDefault();
-					}
 					var res = callback({ args: e });
 					if (res !== undefined && typeof res === 'boolean') {
+						if (!res && preventDefault) {
+							e.preventDefault();
+						}
 						return res;
+					} else if (preventDefault) {
+						e.preventDefault();
 					}
+					return true;
 				});
 			})();
 		}

diff --git a/dist/es2015/akp-event-handler.js b/dist/es2015/akp-event-handler.js
@@ -62,13 +62,17 @@ export let AKPEventHandler = (_dec = inject(DOM, AKPConfiguration), _dec(_class
 		if (triggerContext) {
 			let mouseTrap = new Mousetrap(triggerContext);
 			mouseTrap.bind(key, function (e) {
-				if (preventDefault) {
-					e.preventDefault();
-				}
+
 				var res = callback({ args: e });
 				if (res !== undefined && typeof res === 'boolean') {
+					if (!res && preventDefault) {
+						e.preventDefault();
+					}
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
 			});
 		} else {
 			this.registeredKeys.push(new KeyEvent(key, callback, preventDefault));
@@ -78,14 +82,16 @@ export let AKPEventHandler = (_dec = inject(DOM, AKPConfiguration), _dec(_class
 				if (!self.checkBlocks(context)) {
 					return false;
 				}
-
-				if (preventDefault) {
-					e.preventDefault();
-				}
 				var res = callback({ args: e });
 				if (res !== undefined && typeof res === 'boolean') {
+					if (!res && preventDefault) {
+						e.preventDefault();
+					}
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
 			});
 		}
 	}

diff --git a/dist/system/akp-event-handler.js b/dist/system/akp-event-handler.js
@@ -84,13 +84,17 @@ System.register(['aurelia-framework', 'aurelia-pal', './akp-configuration', 'mou
 					if (triggerContext) {
 						var mouseTrap = new Mousetrap(triggerContext);
 						mouseTrap.bind(key, function (e) {
-							if (preventDefault) {
-								e.preventDefault();
-							}
+
 							var res = callback({ args: e });
 							if (res !== undefined && typeof res === 'boolean') {
+								if (!res && preventDefault) {
+									e.preventDefault();
+								}
 								return res;
+							} else if (preventDefault) {
+								e.preventDefault();
 							}
+							return true;
 						});
 					} else {
 						(function () {
@@ -101,14 +105,16 @@ System.register(['aurelia-framework', 'aurelia-pal', './akp-configuration', 'mou
 								if (!self.checkBlocks(context)) {
 									return false;
 								}
-
-								if (preventDefault) {
-									e.preventDefault();
-								}
 								var res = callback({ args: e });
 								if (res !== undefined && typeof res === 'boolean') {
+									if (!res && preventDefault) {
+										e.preventDefault();
+									}
 									return res;
+								} else if (preventDefault) {
+									e.preventDefault();
 								}
+								return true;
 							});
 						})();
 					}

diff --git a/dist/temp/aurelia-keyboard-plugin.js b/dist/temp/aurelia-keyboard-plugin.js
@@ -99,13 +99,17 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
 		if (triggerContext) {
 			var mouseTrap = new Mousetrap(triggerContext);
 			mouseTrap.bind(key, function (e) {
-				if (preventDefault) {
-					e.preventDefault();
-				}
+
 				var res = callback({ args: e });
 				if (res !== undefined && typeof res === 'boolean') {
+					if (!res && preventDefault) {
+						e.preventDefault();
+					}
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
 			});
 		} else {
 			(function () {
@@ -116,14 +120,16 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
 					if (!self.checkBlocks(context)) {
 						return false;
 					}
-
-					if (preventDefault) {
-						e.preventDefault();
-					}
 					var res = callback({ args: e });
 					if (res !== undefined && typeof res === 'boolean') {
+						if (!res && preventDefault) {
+							e.preventDefault();
+						}
 						return res;
+					} else if (preventDefault) {
+						e.preventDefault();
 					}
+					return true;
 				});
 			})();
 		}

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 0.3.13 (2016-05-03)
+** Added support to return true if you want to not preventDefault() and bubble on. 
+
 ### 0.3.12 (2016-05-03)
 ** Cleanup 
 ** Added new attribute keyblock, prevents all keybinds added above the block in the dom structure.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-keyboard-plugin",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "A keyboard plugin for Aurelia",
   "keywords": [
     "aurelia",

diff --git a/src/akp-event-handler.js b/src/akp-event-handler.js
@@ -63,13 +63,18 @@ export class AKPEventHandler {
 			//only trigger inside context
 			let mouseTrap = new Mousetrap(triggerContext);
 			mouseTrap.bind(key, function(e) {
-				if (preventDefault) {
-					e.preventDefault();
-				}
+
 				var res = callback({args: e});
 				if(res !== undefined && typeof res === 'boolean') {
+					if(!res && preventDefault) {						
+						e.preventDefault();
+					}					
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
+
 			});
 		}  else {
 			this.registeredKeys.push(new KeyEvent(key, callback, preventDefault));
@@ -79,14 +84,16 @@ export class AKPEventHandler {
 				if(!self.checkBlocks(context)) {
 					return false;
 				}
-
-				if (preventDefault) {
-					e.preventDefault();
-				}
 				var res = callback({args: e});
 				if(res !== undefined && typeof res === 'boolean') {
+					if(!res && preventDefault) {						
+						e.preventDefault();
+					}					
 					return res;
+				} else if (preventDefault) {
+					e.preventDefault();
 				}
+				return true;
 			});
 		}
 	}