diff --git a/core/modules/toolbar/js/views/ToolbarAuralView.js b/core/modules/toolbar/js/views/ToolbarAuralView.js index 3cc9adaf4c..34f24d4932 100644 --- a/core/modules/toolbar/js/views/ToolbarAuralView.js +++ b/core/modules/toolbar/js/views/ToolbarAuralView.js @@ -52,18 +52,20 @@ */ onActiveTrayChange: function (model, tray) { var relevantTray = (tray === null) ? model.previous('activeTray') : tray; - var action = (tray === null) ? Drupal.t('closed') : Drupal.t('opened'); - var trayNameElement = relevantTray.querySelector('.toolbar-tray-name'); - var text; - if (trayNameElement !== null) { - text = Drupal.t('Tray "@tray" @action.', { - '@tray': trayNameElement.textContent, '@action': action - }); + if (relevantTray) { + var action = (tray === null) ? Drupal.t('closed') : Drupal.t('opened'); + var trayNameElement = relevantTray.querySelector('.toolbar-tray-name'); + var text; + if (trayNameElement !== null) { + text = Drupal.t('Tray "@tray" @action.', { + '@tray': trayNameElement.textContent, '@action': action + }); + } + else { + text = Drupal.t('Tray @action.', {'@action': action}); + } + Drupal.announce(text); } - else { - text = Drupal.t('Tray @action.', {'@action': action}); - } - Drupal.announce(text); } });