diff --git a/core/lib/Drupal/Core/Render/Element/StatusMessages.php b/core/lib/Drupal/Core/Render/Element/StatusMessages.php index 00f6430..febf018 100644 --- a/core/lib/Drupal/Core/Render/Element/StatusMessages.php +++ b/core/lib/Drupal/Core/Render/Element/StatusMessages.php @@ -104,7 +104,6 @@ public static function renderMessages(array $element, array $context) { // Render the messages. $messages = [ - '#attached' => ['library' => ['core/drupal.message']], '#theme' => 'status_messages', // @todo Improve when https://www.drupal.org/node/2278383 lands. '#message_list' => drupal_get_messages($context['display']), diff --git a/core/misc/message.js b/core/misc/message.js index 44fb4f2..64fd110 100644 --- a/core/misc/message.js +++ b/core/misc/message.js @@ -6,8 +6,9 @@ "use strict"; - var messages = []; - var messagesElement; + var messages = [], + messagesElement, + debouncedProcessMessages; /** * Builds a div element with the aria-live attribute and attaches it to the DOM. @@ -28,10 +29,11 @@ * @see debouncedProcessMessages */ function processMessages () { - var text = []; - var message; + var text = [], + message, n, nl; + if (messages.length) { - for (var n = 0, nl = messages.length; n < nl; n++) { + for (n = 0, nl = messages.length; n < nl; n++) { message = messages.pop(); text.unshift(Drupal.theme('message', message)); } @@ -42,7 +44,7 @@ } // Debounce the function in case Drupal.message() is used in a loop. - var debouncedProcessMessages = debounce(processMessages, 100); + debouncedProcessMessages = debounce(processMessages, 100); /** * Displays a message on the page.