Merge pull request #555 from maxlapko/patch-2

Allows to set html id attribute for submenu
clevertech · Jul 8, 2013 · 254f586 · 254f586
2 parents a482614 + 851dc8c
commit 254f586
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/widgets/TbBaseMenu.php b/src/widgets/TbBaseMenu.php
@@ -110,15 +110,15 @@ protected function renderMenu($items)
 					}
 
 					if (isset($item['items']) && !empty($item['items'])) {
-						$this->controller->widget(
+						$dropdownOptions = array(
-							'bootstrap.widgets.TbDropdown',
+							'encodeLabel' => $this->encodeLabel,
-							array(
+							'htmlOptions' => isset($item['submenuOptions']) ? $item['submenuOptions']
-								'encodeLabel' => $this->encodeLabel,
+								: $this->submenuHtmlOptions,
-								'htmlOptions' => isset($item['submenuOptions']) ? $item['submenuOptions']
+							'items' => $item['items'],
-									: $this->submenuHtmlOptions,
-								'items' => $item['items'],
-							)
 						);
+						$dropdownOptions['id'] = isset($dropdownOptions['htmlOptions']['id']) ? 
+							$dropdownOptions['htmlOptions']['id'] : null;
+						$this->controller->widget('bootstrap.widgets.TbDropdown', $dropdownOptions);
 					}
 
 					echo '</li>';