From 5c8b098b1e37475e0056528e551a6d97c73b83ef Mon Sep 17 00:00:00 2001 From: Michal Dabski Date: Sat, 11 Feb 2023 15:43:24 +0000 Subject: [PATCH] Fix logic for selecting search key string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current logic incorrectly shows "⌘ + K" in Chrome on Windows (user agent 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36'). It does not contain "Mac". The logic was introduced in #1236 and appears to be swapped - showing Windows/Linux shortcut on mac and vice-versa. --- djangoproject/static/js/mod/search-key.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangoproject/static/js/mod/search-key.js b/djangoproject/static/js/mod/search-key.js index a131d22f59..a5f95b9f9f 100644 --- a/djangoproject/static/js/mod/search-key.js +++ b/djangoproject/static/js/mod/search-key.js @@ -12,7 +12,7 @@ define([ $(document).ready(function () { const search_form_input = self.search_form.find('input'); const raw_placeholder = search_form_input.attr('placeholder'); - const shortcut = navigator.userAgent.indexOf("Mac") === -1 ? "⌘ + K" : "Ctrl + K"; + const shortcut = navigator.userAgent.indexOf("Mac") === -1 ? "Ctrl + K" : "⌘ + K"; search_form_input.attr('placeholder', `${raw_placeholder} (${shortcut})`); $(window).keydown(function(e) {