Merge branch 'route-shift-key' of https://github.com/tobscure/mithril.js into tobscure-route-shift-key
Conflicts: mithril.js
This commit is contained in:
commit
871e32fca3
1 changed files with 1 additions and 2 deletions
|
|
@ -993,8 +993,7 @@ var m = (function app(window, undefined) {
|
||||||
}
|
}
|
||||||
function routeUnobtrusive(e) {
|
function routeUnobtrusive(e) {
|
||||||
e = e || event;
|
e = e || event;
|
||||||
|
if (e.ctrlKey || e.metaKey || e.shiftKey || e.which === 2) return;
|
||||||
if (e.ctrlKey || e.metaKey || e.which === 2) return;
|
|
||||||
|
|
||||||
if (e.preventDefault) e.preventDefault();
|
if (e.preventDefault) e.preventDefault();
|
||||||
else e.returnValue = false;
|
else e.returnValue = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue