From 80007998d0fc6307ee8e6e3e11bce8f15d536c40 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Fri, 6 Mar 2020 11:05:08 -0700
Subject: [PATCH] Template: Filter out [shift] key for [ctrl] shortcuts to
 prevent browser conflicts.

---
 themes/default/template.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/default/template.php b/themes/default/template.php
index 843ff3dbea..4ec3a686f8 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -311,7 +311,7 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			echo "		}\n";
 
 		//key: [ctrl]+[a], list,edit: to check all
-			echo "		if ((((e.which == 97 || e.which == 65) && (e.ctrlKey || e.metaKey)) || e.which == 19) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {\n";
+			echo "		if ((((e.which == 97 || e.which == 65) && (e.ctrlKey || e.metaKey) && !e.shiftKey) || e.which == 19) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {\n";
 			echo "			var list_checkbox_all;\n";
 			echo "			list_checkbox_all = document.querySelectorAll('table.list tr.list-header th.checkbox input[name=checkbox_all]');\n";
 			echo "			if (list_checkbox_all !== null && list_checkbox_all.length > 0) {\n";
@@ -331,7 +331,7 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			echo "		}\n";
 
 		//key: [ctrl]+[s], edit: to save
-			echo "		if (((e.which == 115 || e.which == 83) && (e.ctrlKey || e.metaKey)) || (e.which == 19)) {\n";
+			echo "		if (((e.which == 115 || e.which == 83) && (e.ctrlKey || e.metaKey) && !e.shiftKey) || (e.which == 19)) {\n";
 			echo "			e.preventDefault();\n";
 			echo "			var edit_save_button;\n";
 			echo "			edit_save_button = document.getElementById('btn_save');\n";
@@ -342,11 +342,11 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			echo "		}\n";
 
 		//key: [ctrl]+[c], list,edit: to copy
-			if (http_user_agent('name_short') == 'Safari') { //emulate with detecting [c] only, as [command] and [control] keys are ignored if captured
+			if (http_user_agent('name_short') == 'Safari') { //emulate with detecting [c] only, as [command] and [control] keys are ignored when captured
 				echo "	if ((e.which == 99 || e.which == 67) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {\n";
 			}
 			else {
-				echo "	if ((((e.which == 99 || e.which == 67) && (e.ctrlKey || e.metaKey)) || (e.which == 19)) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {\n";
+				echo "	if ((((e.which == 99 || e.which == 67) && (e.ctrlKey || e.metaKey) && !e.shiftKey) || (e.which == 19)) && !(e.target.tagName == 'INPUT' && e.target.type == 'text') && e.target.tagName != 'TEXTAREA') {\n";
 			}
 			echo "			var current_selection, copy_button;\n";
 			echo "			current_selection = window.getSelection();\n";