OpenSourceArk/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2024-06-14 11:52:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed search hotkey stealing focus from non-form textarea

Browse Source
This commit is contained in:
squidfunk 2019-04-28 11:49:40 +02:00
parent 611dc9718f
commit b245e9f769
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
material/assets/javascripts/application.bef98be6.js → material/assets/javascripts/application.8c0d971c.js
View File

File diff suppressed because one or more lines are too long

2
material/base.html
View File

@ -190,7 +190,7 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ 'assets/javascripts/application.bef98be6.js' | url }}"></script> <script src="{{ 'assets/javascripts/application.8c0d971c.js' | url }}"></script>
{% if lang.t("search.language") != "en" %} {% if lang.t("search.language") != "en" %}
{% set languages = lang.t("search.language").split(",") %} {% set languages = lang.t("search.language").split(",") %}
{% if languages | length and languages[0] != "" %} {% if languages | length and languages[0] != "" %}

7
src/assets/javascripts/application.js
View File

@ -341,7 +341,7 @@ function initialize(config) { // eslint-disable-line func-style
/* Skip editable elements */ /* Skip editable elements */
if (document.activeElement instanceof HTMLElement && if (document.activeElement instanceof HTMLElement &&
document.activeElement.contentEditable === "true") document.activeElement.isContentEditable)
return return
/* Abort if meta key (macOS) or ctrl key (Windows) is pressed */ /* Abort if meta key (macOS) or ctrl key (Windows) is pressed */
@ -420,6 +420,11 @@ function initialize(config) { // eslint-disable-line func-style
/* Search is closed and we're not inside a form */ /* Search is closed and we're not inside a form */
} else if (document.activeElement && !document.activeElement.form) { } else if (document.activeElement && !document.activeElement.form) {
/* Fixes #1026: search grabs focus for non-form input elements */
if (document.activeElement.tagName === "TEXTAREA" ||
document.activeElement.tagName === "INPUT")
return
/* F/S: Open search if not in input field */ /* F/S: Open search if not in input field */
if (ev.keyCode === 70 || ev.keyCode === 83) { if (ev.keyCode === 70 || ev.keyCode === 83) {
query.focus() query.focus()