diff --git a/core/misc/announce.js b/core/misc/announce.js index 4d29df5..0f10748 100644 --- a/core/misc/announce.js +++ b/core/misc/announce.js @@ -34,7 +34,7 @@ * Attaches the behavior for drupalAnnouce. */ Drupal.behaviors.drupalAnnounce = { - attach: function () { + attach: function (context) { // Create only one aria-live element. if (!liveElement) { liveElement = document.createElement('div'); diff --git a/core/modules/system/templates/status-messages.html.twig b/core/modules/system/templates/status-messages.html.twig index 243df6e..e8f64e0 100644 --- a/core/modules/system/templates/status-messages.html.twig +++ b/core/modules/system/templates/status-messages.html.twig @@ -24,25 +24,26 @@ */ #}
- {% for type, messages in message_list %} -
- {% if type == 'error' %} -
- {% endif %} - {% if status_headings[type] %} -

{{ status_headings[type] }}

- {% endif %} - {% if messages|length > 1 %} -
    - {% for message in messages %} -
  • {{ message }}
  • - {% endfor %} -
- {% else %} - {{ messages|first }} - {% endif %} -
+{% for type, messages in message_list %} +
+ {% if type == 'error' %} +
+ {% endif %} + {% if status_headings[type] %} +

{{ status_headings[type] }}

+ {% endif %} + {% if messages|length > 1 %} +
    + {% for message in messages %} +
  • {{ message }}
  • {% endfor %} -
-
\ No newline at end of file + + {% else %} + {{ messages|first }} + {% endif %} + {% if type == 'error' %} +
+ {% endif %} +
+{% endfor %} + diff --git a/core/themes/classy/templates/misc/status-messages.html.twig b/core/themes/classy/templates/misc/status-messages.html.twig index c635a58..0d059f3 100644 --- a/core/themes/classy/templates/misc/status-messages.html.twig +++ b/core/themes/classy/templates/misc/status-messages.html.twig @@ -54,4 +54,4 @@ {% set attributes = attributes.removeClass(classes) %} {% endfor %} {% endblock messages %} - \ No newline at end of file +