Skip to content
This repository was archived by the owner on Sep 27, 2018. It is now read-only.

Commit 3661e23

Browse files
4nderss4nderss
committed
0.3.13
1 parent 05ecbfb commit 3661e23

File tree

9 files changed

+97
-50
lines changed

9 files changed

+97
-50
lines changed

‎dist/amd/akp-event-handler.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,17 @@ define(['exports', 'aurelia-framework', 'aurelia-pal', './akp-configuration', 'm
9797
if (triggerContext) {
9898
var mouseTrap = new Mousetrap(triggerContext);
9999
mouseTrap.bind(key, function (e) {
100-
if (preventDefault) {
101-
e.preventDefault();
102-
}
100+
103101
var res = callback({ args: e });
104102
if (res !== undefined && typeof res === 'boolean') {
103+
if (!res && preventDefault) {
104+
e.preventDefault();
105+
}
105106
return res;
107+
} else if (preventDefault) {
108+
e.preventDefault();
106109
}
110+
return true;
107111
});
108112
} else {
109113
(function () {
@@ -114,14 +118,16 @@ define(['exports', 'aurelia-framework', 'aurelia-pal', './akp-configuration', 'm
114118
if (!self.checkBlocks(context)) {
115119
return false;
116120
}
117-
118-
if (preventDefault) {
119-
e.preventDefault();
120-
}
121121
var res = callback({ args: e });
122122
if (res !== undefined && typeof res === 'boolean') {
123+
if (!res && preventDefault) {
124+
e.preventDefault();
125+
}
123126
return res;
127+
} else if (preventDefault) {
128+
e.preventDefault();
124129
}
130+
return true;
125131
});
126132
})();
127133
}

‎dist/aurelia-keyboard-plugin.js‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,18 @@ export class AKPEventHandler {
7575
//only trigger inside context
7676
let mouseTrap = new Mousetrap(triggerContext);
7777
mouseTrap.bind(key, function(e) {
78-
if (preventDefault) {
79-
e.preventDefault();
80-
}
78+
8179
var res = callback({args: e});
8280
if(res !== undefined && typeof res === 'boolean') {
81+
if(!res && preventDefault) {
82+
e.preventDefault();
83+
}
8384
return res;
85+
} else if (preventDefault) {
86+
e.preventDefault();
8487
}
88+
return true;
89+
8590
});
8691
} else {
8792
this.registeredKeys.push(new KeyEvent(key, callback, preventDefault));
@@ -91,14 +96,16 @@ export class AKPEventHandler {
9196
if(!self.checkBlocks(context)) {
9297
return false;
9398
}
94-
95-
if (preventDefault) {
96-
e.preventDefault();
97-
}
9899
var res = callback({args: e});
99100
if(res !== undefined && typeof res === 'boolean') {
101+
if(!res && preventDefault) {
102+
e.preventDefault();
103+
}
100104
return res;
105+
} else if (preventDefault) {
106+
e.preventDefault();
101107
}
108+
return true;
102109
});
103110
}
104111
}

‎dist/commonjs/akp-event-handler.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
8585
if (triggerContext) {
8686
var mouseTrap = new Mousetrap(triggerContext);
8787
mouseTrap.bind(key, function (e) {
88-
if (preventDefault) {
89-
e.preventDefault();
90-
}
88+
9189
var res = callback({ args: e });
9290
if (res !== undefined && typeof res === 'boolean') {
91+
if (!res && preventDefault) {
92+
e.preventDefault();
93+
}
9394
return res;
95+
} else if (preventDefault) {
96+
e.preventDefault();
9497
}
98+
return true;
9599
});
96100
} else {
97101
(function () {
@@ -102,14 +106,16 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
102106
if (!self.checkBlocks(context)) {
103107
return false;
104108
}
105-
106-
if (preventDefault) {
107-
e.preventDefault();
108-
}
109109
var res = callback({ args: e });
110110
if (res !== undefined && typeof res === 'boolean') {
111+
if (!res && preventDefault) {
112+
e.preventDefault();
113+
}
111114
return res;
115+
} else if (preventDefault) {
116+
e.preventDefault();
112117
}
118+
return true;
113119
});
114120
})();
115121
}

‎dist/es2015/akp-event-handler.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,17 @@ export let AKPEventHandler = (_dec = inject(DOM, AKPConfiguration), _dec(_class
6262
if (triggerContext) {
6363
let mouseTrap = new Mousetrap(triggerContext);
6464
mouseTrap.bind(key, function (e) {
65-
if (preventDefault) {
66-
e.preventDefault();
67-
}
65+
6866
var res = callback({ args: e });
6967
if (res !== undefined && typeof res === 'boolean') {
68+
if (!res && preventDefault) {
69+
e.preventDefault();
70+
}
7071
return res;
72+
} else if (preventDefault) {
73+
e.preventDefault();
7174
}
75+
return true;
7276
});
7377
} else {
7478
this.registeredKeys.push(new KeyEvent(key, callback, preventDefault));
@@ -78,14 +82,16 @@ export let AKPEventHandler = (_dec = inject(DOM, AKPConfiguration), _dec(_class
7882
if (!self.checkBlocks(context)) {
7983
return false;
8084
}
81-
82-
if (preventDefault) {
83-
e.preventDefault();
84-
}
8585
var res = callback({ args: e });
8686
if (res !== undefined && typeof res === 'boolean') {
87+
if (!res && preventDefault) {
88+
e.preventDefault();
89+
}
8790
return res;
91+
} else if (preventDefault) {
92+
e.preventDefault();
8893
}
94+
return true;
8995
});
9096
}
9197
}

‎dist/system/akp-event-handler.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,17 @@ System.register(['aurelia-framework', 'aurelia-pal', './akp-configuration', 'mou
8484
if (triggerContext) {
8585
var mouseTrap = new Mousetrap(triggerContext);
8686
mouseTrap.bind(key, function (e) {
87-
if (preventDefault) {
88-
e.preventDefault();
89-
}
87+
9088
var res = callback({ args: e });
9189
if (res !== undefined && typeof res === 'boolean') {
90+
if (!res && preventDefault) {
91+
e.preventDefault();
92+
}
9293
return res;
94+
} else if (preventDefault) {
95+
e.preventDefault();
9396
}
97+
return true;
9498
});
9599
} else {
96100
(function () {
@@ -101,14 +105,16 @@ System.register(['aurelia-framework', 'aurelia-pal', './akp-configuration', 'mou
101105
if (!self.checkBlocks(context)) {
102106
return false;
103107
}
104-
105-
if (preventDefault) {
106-
e.preventDefault();
107-
}
108108
var res = callback({ args: e });
109109
if (res !== undefined && typeof res === 'boolean') {
110+
if (!res && preventDefault) {
111+
e.preventDefault();
112+
}
110113
return res;
114+
} else if (preventDefault) {
115+
e.preventDefault();
111116
}
117+
return true;
112118
});
113119
})();
114120
}

‎dist/temp/aurelia-keyboard-plugin.js‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,17 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
9999
if (triggerContext) {
100100
var mouseTrap = new Mousetrap(triggerContext);
101101
mouseTrap.bind(key, function (e) {
102-
if (preventDefault) {
103-
e.preventDefault();
104-
}
102+
105103
var res = callback({ args: e });
106104
if (res !== undefined && typeof res === 'boolean') {
105+
if (!res && preventDefault) {
106+
e.preventDefault();
107+
}
107108
return res;
109+
} else if (preventDefault) {
110+
e.preventDefault();
108111
}
112+
return true;
109113
});
110114
} else {
111115
(function () {
@@ -116,14 +120,16 @@ var AKPEventHandler = exports.AKPEventHandler = (_dec = (0, _aureliaFramework.in
116120
if (!self.checkBlocks(context)) {
117121
return false;
118122
}
119-
120-
if (preventDefault) {
121-
e.preventDefault();
122-
}
123123
var res = callback({ args: e });
124124
if (res !== undefined && typeof res === 'boolean') {
125+
if (!res && preventDefault) {
126+
e.preventDefault();
127+
}
125128
return res;
129+
} else if (preventDefault) {
130+
e.preventDefault();
126131
}
132+
return true;
127133
});
128134
})();
129135
}

‎doc/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 0.3.13 (2016-05-03)
2+
** Added support to return true if you want to not preventDefault() and bubble on.
3+
14
### 0.3.12 (2016-05-03)
25
** Cleanup
36
** Added new attribute keyblock, prevents all keybinds added above the block in the dom structure.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-keyboard-plugin",
3-
"version": "0.3.12",
3+
"version": "0.3.13",
44
"description": "A keyboard plugin for Aurelia",
55
"keywords": [
66
"aurelia",

‎src/akp-event-handler.js‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,18 @@ export class AKPEventHandler {
6363
//only trigger inside context
6464
let mouseTrap = new Mousetrap(triggerContext);
6565
mouseTrap.bind(key, function(e) {
66-
if (preventDefault) {
67-
e.preventDefault();
68-
}
66+
6967
var res = callback({args: e});
7068
if(res !== undefined && typeof res === 'boolean') {
69+
if(!res && preventDefault) {
70+
e.preventDefault();
71+
}
7172
return res;
73+
} else if (preventDefault) {
74+
e.preventDefault();
7275
}
76+
return true;
77+
7378
});
7479
} else {
7580
this.registeredKeys.push(new KeyEvent(key, callback, preventDefault));
@@ -79,14 +84,16 @@ export class AKPEventHandler {
7984
if(!self.checkBlocks(context)) {
8085
return false;
8186
}
82-
83-
if (preventDefault) {
84-
e.preventDefault();
85-
}
8687
var res = callback({args: e});
8788
if(res !== undefined && typeof res === 'boolean') {
89+
if(!res && preventDefault) {
90+
e.preventDefault();
91+
}
8892
return res;
93+
} else if (preventDefault) {
94+
e.preventDefault();
8995
}
96+
return true;
9097
});
9198
}
9299
}

0 commit comments

Comments
 (0)