diff -u b/core/misc/message.es6.js b/core/misc/message.es6.js --- b/core/misc/message.es6.js +++ b/core/misc/message.es6.js @@ -99,16 +99,9 @@ return []; } - const whitespace = /\s+/; - const indexes = Array.isArray(index) ? index : [index]; - // If the index has spaces, add several data matches, the same way - const selectors = indexes.map(currentIndex => - // class names work. - currentIndex.trim() - .split(whitespace) - .map(i => `[data-drupal-message-id^="${i}"]`) - .join(''), - ); + // Constuct an array of selectors based on the available message index(s). + const selectors = (Array.isArray(index) ? index : [index]) + .map(currentIndex => `[data-drupal-message-id^="${currentIndex}"]`); return this.messageWrapper.querySelectorAll(selectors.join(',')); } @@ -225,7 +218,7 @@ messageText.innerHTML = messagesTypes[options.type]; } - // Alerts have a different HTML structure + // Alerts have a different HTML structure. if (options.type === 'error') { messageText.setAttribute('role', 'alert'); } diff -u b/core/misc/message.js b/core/misc/message.js --- b/core/misc/message.js +++ b/core/misc/message.js @@ -49,13 +49,8 @@ return []; } - var whitespace = /\s+/; - var indexes = Array.isArray(index) ? index : [index]; - - var selectors = indexes.map(function (currentIndex) { - return currentIndex.trim().split(whitespace).map(function (i) { - return '[data-drupal-message-id^="' + i + '"]'; - }).join(''); + var selectors = (Array.isArray(index) ? index : [index]).map(function (currentIndex) { + return '[data-drupal-message-id^="' + currentIndex + '"]'; }); return this.messageWrapper.querySelectorAll(selectors.join(',')); @@ -139 +134,2 @@ -})(Drupal); \ No newline at end of file +})(Drupal); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["message.es6.js"],"names":["Drupal","message","messageWrapper","document","querySelector","Error","t","options","hasOwnProperty","type","announce","id","String","Math","random","toFixed","replace","appendChild","theme","text","index","Array","isArray","length","selectors","map","currentIndex","querySelectorAll","join","elements","i","removeChild","ids","messages","select","removeElements","status","error","warning","priority","messagesTypes","getMessageTypes","messageWraper","createElement","messageText","setAttribute","innerHTML","insertAdjacentElement"],"mappings":"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","file":"message.es6.js","sourcesContent":["/**\n * @file\n * Message API.\n */\n((Drupal) => {\n  /**\n   * @typedef {object} Drupal.message~messageDefinition\n   */\n\n  /**\n   * Constructs a new instance of the Drupal.message object.\n   *\n   * This provides a uniform interface for adding and removing messages to a\n   * specific location on the page.\n   *\n   * @param {HTMLElement} messageWrapper\n   *   The zone where to add messages. If no element is supplied, the default\n   *   selector is used.\n   *\n   * @return {Drupal.message~messageDefinition}\n   *   Object to add and remove messages.\n   */\n\n  Drupal.message = class {\n    constructor(messageWrapper = document.querySelector('[data-drupal-messages]')) {\n      this.messageWrapper = messageWrapper;\n      if (!this.messageWrapper) {\n        throw new Error(Drupal.t('There is no @element on the page.', { '@element': '[data-drupal-messages]' }));\n      }\n    }\n\n    static getMessageTypes() {\n      return {\n        status: Drupal.t('Status message'),\n        error: Drupal.t('Error message'),\n        warning: Drupal.t('Warning message'),\n      };\n    }\n\n    /**\n     * Sequentially adds a message to the message area.\n     *\n     * @name Drupal.message~messageDefinition.add\n     *\n     * @param {string} message\n     *   The message to display\n     * @param {object} [options]\n     *   The context of the message, used for removing messages again.\n     * @param {string} [options.id]\n     *   The message ID, it can be a simple value: `'filevalidationerror'`\n     *   or several values separated by a space: `'mymodule formvalidation'`\n     *   which can be used as a sort of tag for message deletion.\n     * @param {string} [options.type=status]\n     *   Message type, can be either 'status', 'error' or 'warning'.\n     * @param {string} [options.announce]\n     *   Screen-reader version of the message if necessary. To prevent a message\n     *   being sent to Drupal.announce() this should be `''`.\n     * @param {string} [options.priority]\n     *   Priority of the message for Drupal.announce().\n     *\n     * @return {string}\n     *   ID of message.\n     */\n    add(message, options = {}) {\n      if (!options.hasOwnProperty('type')) {\n        options.type = 'status';\n      }\n\n      if (typeof message !== 'string') {\n        throw new Error('Message must be a string.');\n      }\n\n      // Send message to screen reader.\n      Drupal.message.announce(message, options);\n      // Use the provided index for the message or generate a unique key to\n      // allow message deletion.\n      options.id = options.id ?\n        String(options.id) :\n        `${options.type}-${Math.random().toFixed(15).replace('0.', '')}`;\n      this.messageWrapper.appendChild(Drupal.theme('message', { text: message }, options));\n\n      return options.id;\n    }\n\n    /**\n     * Select a set of messages based on index.\n     *\n     * @name Drupal.message~messageDefinition.select\n     *\n     * @param {string|Array.<string>} index\n     *   The message index to delete from the area.\n     *\n     * @return {NodeList|Array}\n     *   Elements found.\n     */\n    select(index) {\n      // When there are nothing to select, return an empty list.\n      if (!index || (Array.isArray(index) && index.length === 0)) {\n        return [];\n      }\n\n      // Constuct an array of selectors based on the available message index(s).\n      const selectors = (Array.isArray(index) ? index : [index])\n        .map(currentIndex => `[data-drupal-message-id^=\"${currentIndex}\"]`);\n\n      return this.messageWrapper.querySelectorAll(selectors.join(','));\n    }\n\n    /**\n     * Helper to remove elements.\n     *\n     * @param {NodeList|Array.<HTMLElement>} elements\n     *   DOM Nodes to be removed.\n     *\n     * @return {number}\n     *  Number of removed nodes.\n     */\n    removeElements(elements) {\n      if (!elements || !elements.length) {\n        return 0;\n      }\n\n      const length = elements.length;\n      for (let i = 0; i < length; i++) {\n        this.messageWrapper.removeChild(elements[i]);\n      }\n      return length;\n    }\n\n    /**\n     * Removes messages from the message area.\n     *\n     * @name Drupal.message~messageDefinition.remove\n     *\n     * @param {string|Array.<string>} ids\n     *   Index of the message to remove, as returned by\n     *   {@link Drupal.message~messageDefinition.add}, or an\n     *   array of indexes.\n     *\n     * @return {number}\n     *  Number of removed messages.\n     */\n    remove(ids) {\n      const messages = this.select(ids);\n      return this.removeElements(messages);\n    }\n\n    /**\n     * Removes all messages from the message area.\n     *\n     * @name Drupal.message~messageDefinition.clear\n     *\n     * @return {number}\n     *  Number of removed messages.\n     */\n    clear() {\n      const messages = this.messageWrapper.querySelectorAll('[data-drupal-message-id]');\n      return this.removeElements(messages);\n    }\n\n    /**\n     * Helper to call Drupal.announce() with the right parameters.\n     *\n     * @param {string} message\n     *   Displayed message.\n     * @param {object} options\n     *   Additional data.\n     * @param {string} [options.announce]\n     *   Screen-reader version of the message if necessary. To prevent a message\n     *   being sent to Drupal.announce() this should be `''`.\n     * @param {string} [options.priority]\n     *   Priority of the message for Drupal.announce().\n     * @param {string} [options.type]\n     *   Message type, can be either 'status', 'error' or 'warning'.\n     */\n    static announce(message, options) {\n      if (!options.priority && (options.type === 'warning' || options.type === 'error')) {\n        options.priority = 'assertive';\n      }\n      // If screen reader message is not disabled announce screen reader specific\n      // text or fallback to the displayed message.\n      if (options.announce !== '') {\n        Drupal.announce(options.announce || message, options.priority);\n      }\n    }\n  };\n\n  /**\n   * Theme function for a message.\n   *\n   * @param {object} message\n   *   The message object.\n   * @param {string} message.text\n   *   The message text.\n   * @param {object} options\n   *   The message context.\n   * @param {string} options.type\n   *   The message type.\n   * @param {string} options.id\n   *   ID of the message, for reference.\n   *\n   * @return {HTMLElement}\n   *   A DOM Node.\n   */\n  Drupal.theme.message = ({ text }, options) => {\n    const messagesTypes = Drupal.message.getMessageTypes();\n    const messageWraper = document.createElement('div');\n    // let messageText = message.text;\n    const messageText = document.createElement('h2');\n    messageText.setAttribute('class', 'visually-hidden');\n\n    messageWraper.setAttribute('class', `messages messages--${options.type}`);\n    messageWraper.setAttribute('role', 'contentinfo');\n    messageWraper.setAttribute('data-drupal-message-id', options.id);\n    messageWraper.setAttribute('data-drupal-message-type', options.type);\n    if (options.type in messagesTypes) {\n      messageWraper.setAttribute('aria-label', messagesTypes[options.type]);\n      messageText.innerHTML = messagesTypes[options.type];\n    }\n\n    // Alerts have a different HTML structure.\n    if (options.type === 'error') {\n      messageText.setAttribute('role', 'alert');\n    }\n    messageWraper.innerHTML = ` ${text}`;\n    messageWraper.insertAdjacentElement('afterbegin', messageText);\n\n    return messageWraper;\n  };\n})(Drupal);\n"]} \ No newline at end of file