authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-09 18:28:50-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-09 18:28:50-04:00
log510b6443ba1eb36bb2e6f7e992044fd63ee83985
treed5f211f62f4442f87917fe691edf1cac4f7671ae
parent000a1df4a31eb04012d8c1f0bd3bff7815e19a03
signaturelock-open Commit is signed but in an unrecognized format.

generated docs: avoid clobbering browser shortcut keys

1 files changed, 13 insertions(+), 0 deletions(-)

lib/std/special/docs/main.js+13
...@@ -1074,6 +1074,8 @@...@@ -1074,6 +1074,8 @@
1074 function onSearchKeyDown(ev) {1074 function onSearchKeyDown(ev) {
1075 switch (ev.which) {1075 switch (ev.which) {
1076 case 13:1076 case 13:
1077 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1078
1077 // detect if this search changes anything1079 // detect if this search changes anything
1078 var terms1 = getSearchTerms();1080 var terms1 = getSearchTerms();
1079 startSearch();1081 startSearch();
...@@ -1087,6 +1089,8 @@...@@ -1087,6 +1089,8 @@
1087 ev.stopPropagation();1089 ev.stopPropagation();
1088 return;1090 return;
1089 case 27:1091 case 27:
1092 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1093
1090 domSearch.value = "";1094 domSearch.value = "";
1091 domSearch.blur();1095 domSearch.blur();
1092 curSearchIndex = -1;1096 curSearchIndex = -1;
...@@ -1095,16 +1099,22 @@...@@ -1095,16 +1099,22 @@
1095 startSearch();1099 startSearch();
1096 return;1100 return;
1097 case 38:1101 case 38:
1102 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1103
1098 moveSearchCursor(-1);1104 moveSearchCursor(-1);
1099 ev.preventDefault();1105 ev.preventDefault();
1100 ev.stopPropagation();1106 ev.stopPropagation();
1101 return;1107 return;
1102 case 40:1108 case 40:
1109 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1110
1103 moveSearchCursor(1);1111 moveSearchCursor(1);
1104 ev.preventDefault();1112 ev.preventDefault();
1105 ev.stopPropagation();1113 ev.stopPropagation();
1106 return;1114 return;
1107 default:1115 default:
1116 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1117
1108 curSearchIndex = -1;1118 curSearchIndex = -1;
1109 ev.stopPropagation();1119 ev.stopPropagation();
1110 startAsyncSearch();1120 startAsyncSearch();
...@@ -1134,6 +1144,7 @@...@@ -1134,6 +1144,7 @@
1134 function onWindowKeyDown(ev) {1144 function onWindowKeyDown(ev) {
1135 switch (ev.which) {1145 switch (ev.which) {
1136 case 27:1146 case 27:
1147 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1137 if (!domHelpModal.classList.contains("hidden")) {1148 if (!domHelpModal.classList.contains("hidden")) {
1138 domHelpModal.classList.add("hidden");1149 domHelpModal.classList.add("hidden");
1139 ev.preventDefault();1150 ev.preventDefault();
...@@ -1141,6 +1152,7 @@...@@ -1141,6 +1152,7 @@
1141 }1152 }
1142 break;1153 break;
1143 case 83:1154 case 83:
1155 if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1144 domSearch.focus();1156 domSearch.focus();
1145 domSearch.select();1157 domSearch.select();
1146 ev.preventDefault();1158 ev.preventDefault();
...@@ -1148,6 +1160,7 @@...@@ -1148,6 +1160,7 @@
1148 startAsyncSearch();1160 startAsyncSearch();
1149 break;1161 break;
1150 case 191:1162 case 191:
1163 if (!ev.shiftKey || ev.ctrlKey || ev.altKey) return;
1151 ev.preventDefault();1164 ev.preventDefault();
1152 ev.stopPropagation();1165 ev.stopPropagation();
1153 showHelpModal();1166 showHelpModal();