2c2 < index 2f312e2..a03c2a1 100644 --- > index f46bd86..4bfa2b6 100644 5,22c5,22 < @@ -44,13 +44,13 @@ Drupal.toolbar.ToolbarAuralView = Backbone.View.extend({ < */ < onActiveTrayChange: function (model, tray) { < var relevantTray = (tray === null) ? model.previous('activeTray') : tray; < - var trayName = relevantTray.querySelector('.toolbar-tray-name').textContent; < - var text; < - if (tray === null) { < - text = Drupal.t('Tray "@tray" closed.', { '@tray': trayName }); < - } < - else { < - text = Drupal.t('Tray "@tray" opened.', { '@tray': trayName }); < + var trayNameElement = relevantTray.querySelector('.toolbar-tray-name'); < + var action = (tray === null ? 'closed' : 'opened'); < + if (trayNameElement !== null){ < + var trayName = trayNameElement.textContent; < + var text = Drupal.t('Tray "@tray" ' + action + '.', {'@tray': trayName}); < + } else{ < + var text = Drupal.t('Tray ' + action + '.'); --- > @@ -44,13 +44,14 @@ > */ > onActiveTrayChange: function (model, tray) { > var relevantTray = (tray === null) ? model.previous('activeTray') : tray; > - var trayName = relevantTray.querySelector('.toolbar-tray-name').textContent; > + var trayNameElement = relevantTray.querySelector('.toolbar-tray-name'); > + var action = (tray === null ? 'closed' : 'opened'); > var text; > - if (tray === null) { > - text = Drupal.t('Tray "@tray" closed.', { '@tray': trayName }); > + if (trayNameElement) { > + text = Drupal.t('Tray "@tray" ' + action + '.', {'@tray': trayNameElement.textContent}); > } > else { > - text = Drupal.t('Tray "@tray" opened.', { '@tray': trayName }); > + text = Drupal.t('Tray ' + action + '.'); > } > Drupal.announce(text); 24,25d23 < Drupal.announce(text); < }