Play nice with Mac desktop keyboard modifiers (#1072)

Martii · web-flow · commit 810a8e7e881a · 2017-04-04T11:06:13.000-06:00
Applies to #904 and #1062 Auto-merge
diff --git a/views/includes/scripts/tableTrLinkScript.html b/views/includes/scripts/tableTrLinkScript.html
@@ -28,12 +28,12 @@
       aEv.stopPropagation();
 
       // Redirect to the anchor href
-      if (aEv.ctrlKey && aEv.shiftKey) {
+      if ((aEv.ctrlKey || aEv.metaKey) && aEv.shiftKey) {
         window.open(url, '_blank').focus();
         return;
       }
 
-      if (aEv.ctrlKey) {
+      if (aEv.ctrlKey || aEv.metaKey) {
         window.open(url, '_blank').blur();
         return;
       }

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@`
`28`	`28`	`aEv.stopPropagation();`
`29`	`29`
`30`	`30`	`// Redirect to the anchor href`
`31`		`- if (aEv.ctrlKey && aEv.shiftKey) {`
	`31`	`+ if ((aEv.ctrlKey \|\| aEv.metaKey) && aEv.shiftKey) {`
`32`	`32`	`window.open(url, '_blank').focus();`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (aEv.ctrlKey) {`
	`36`	`+ if (aEv.ctrlKey \|\| aEv.metaKey) {`
`37`	`37`	`window.open(url, '_blank').blur();`
`38`	`38`	`return;`
`39`	`39`	`}`