Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1877482 by bertramakers | benjifisher: Fixed Toolbar tabs should have ID attributes based on hook_toolbar() array keys rather than sequentially numbering.

8.0.x
Alex Pott 2014-11-17 10:51:16 +00:00
parent 1397bd65bc
commit b733559eb7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/toolbar/src/Element/Toolbar.php
View File

@ -7,7 +7,9 @@
namespace Drupal\toolbar\Element; namespace Drupal\toolbar\Element;
use Drupal\Component\Utility\Html;
use Drupal\Core\Render\Element\RenderElement; use Drupal\Core\Render\Element\RenderElement;
use Drupal\Core\Render\Element;
/** /**
* Provides a render element for the default Drupal toolbar. * Provides a render element for the default Drupal toolbar.
@ -97,6 +99,11 @@ class Toolbar extends RenderElement {
// Merge in the original toolbar values. // Merge in the original toolbar values.
$element = array_merge($element, $items); $element = array_merge($element, $items);
// Assign each item a unique ID, based on its key.
foreach (Element::children($element) as $key) {
$element[$key]['#id'] = Html::getId('toolbar-item-' . $key);
}
// Render the children. // Render the children.
$element['#children'] = drupal_render_children($element); $element['#children'] = drupal_render_children($element);

4
core/modules/toolbar/src/Element/ToolbarItem.php
View File

@ -7,7 +7,6 @@
namespace Drupal\toolbar\Element; namespace Drupal\toolbar\Element;
use Drupal\Component\Utility\Html;
use Drupal\Core\Render\Element\RenderElement; use Drupal\Core\Render\Element\RenderElement;
use Drupal\Core\Url; use Drupal\Core\Url;
@ -50,8 +49,7 @@ class ToolbarItem extends RenderElement {
* A renderable array. * A renderable array.
*/ */
public static function preRenderToolbarItem($element) { public static function preRenderToolbarItem($element) {
// Assign each item a unique ID. $id = $element['#id'];
$id = Html::getUniqueId('toolbar-item');
// Provide attributes for a toolbar item. // Provide attributes for a toolbar item.
$attributes = array( $attributes = array(