From d4e7a9f05bc45def5e5738ffd8d2391795311fd0 Mon Sep 17 00:00:00 2001 From: Javier Sánchez Parra Date: Fri, 25 Mar 2022 11:19:53 +0100 Subject: Replace " " with "_" in HTML scopes IDs Otherwise, scopes with whitespaces in their names breaks the javascript code. From https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id: --- Note: Technically, in HTML5, the value for an id attribute may contain any character, except whitespace characters. However, to avoid inadvertent errors, only ASCII letters, digits, '_', and '-' should be used and the value for an id attribute should start with a letter. For example, . has a special meaning in CSS (it acts as a class selector). Unless you are careful to escape it in the CSS, it won't be recognized as part of the value of an id attribute. It is easy to forget to do this, resulting in bugs in your code that could be hard to detect. --- --- ogcp/static/js/ogcp.js | 4 ++-- ogcp/templates/macros.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ogcp/static/js/ogcp.js b/ogcp/static/js/ogcp.js index 0f3a648..ac31c65 100644 --- a/ogcp/static/js/ogcp.js +++ b/ogcp/static/js/ogcp.js @@ -4,7 +4,7 @@ let updateTimeoutId = null; function showSelectedClient(client_checkbox) { const container = $('#selected-clients'); - const pill_id = 'pill-' + client_checkbox.name.replaceAll('.', '_'); + const pill_id = 'pill-' + client_checkbox.name.replaceAll(/[.]|[ ]/g, '_'); if (client_checkbox.checked) { if (!($('#' + pill_id).length)) @@ -124,7 +124,7 @@ function updatePillStatus(state, pill) { function updateScopes(scopes) { scopes.forEach((scope) => { if (scope.state) { - const scopeId = `${scope.name}_${scope.id}`.replaceAll('.', '_'); + const scopeId = `${scope.name}_${scope.id}`.replaceAll(/[.]|[ ]/g, '_'); const iconEl = document.querySelector(`#${scopeId} .nav-icon`); const iconCls = ['fas', 'far', 'text-danger', 'text-success', 'text-warning', 'text-wol']; diff --git a/ogcp/templates/macros.html b/ogcp/templates/macros.html index fed48a6..96561db 100644 --- a/ogcp/templates/macros.html +++ b/ogcp/templates/macros.html @@ -21,7 +21,7 @@ {% macro scopes_tree_collapse_level(scopes, i, parent_id, state) -%} {% for scope in scopes %} -