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:
Leo Horie 2015-12-21 09:32:47 -05:00
commit 871e32fca3

View file

@ -993,8 +993,7 @@ var m = (function app(window, undefined) {
}
function routeUnobtrusive(e) {
e = e || event;
if (e.ctrlKey || e.metaKey || e.which === 2) return;
if (e.ctrlKey || e.metaKey || e.shiftKey || e.which === 2) return;
if (e.preventDefault) e.preventDefault();
else e.returnValue = false;