|
66 | 66 |
|
67 | 67 | {% block dropdownList %} |
68 | 68 | {% spaceless %} |
69 | | - {% if item.hasChildren and options.depth is not sameas(0) and item.displayChildren %} |
| 69 | + {% if item.hasChildren and options.depth is not sameas(0) and ((item.extras.dropdown is not defined and item.displayChildren is sameas(true) or item.extras.dropdown is defined and item.extras.dropdown is sameas(true) and item.displayChildren is sameas(true))) %} |
70 | 70 | {% set listAttributes = listAttributes|merge({'class': (listAttributes.class|default('') ~ ' dropdown-menu')|trim}) %} |
71 | 71 | <ul{{ _self.attributes(listAttributes) }}> |
72 | 72 | {{ block('children') }} |
|
117 | 117 | {%- endif %} |
118 | 118 | {%- if item.hasChildren and ((options.style is defined and options.style == 'list') or options.currentDepth is not sameas(1)) %} |
119 | 119 | {%- set classes = classes|merge(['nav-header']) %} |
120 | | - {%- elseif item.hasChildren and options.style is defined and options.style in ['tabs', 'justified-tabs', 'pills', 'justified-pills', 'navbar', 'navbar-right', 'navbar_justified'] %} |
| 120 | + {%- elseif item.hasChildren and options.style is defined and options.style in ['tabs', 'justified-tabs', 'pills', 'justified-pills', 'navbar', 'navbar-right', 'navbar_justified'] and ((item.extras.dropdown is not defined and item.displayChildren is sameas(true) or item.extras.dropdown is defined and item.extras.dropdown is sameas(true) and item.displayChildren is sameas(true))) %} |
121 | 121 | {%- set classes = classes|merge(['dropdown']) %} |
122 | 122 | {%- endif %} |
123 | 123 |
|
|
135 | 135 | {# displaying the item #} |
136 | 136 | <li{{ _self.attributes(attributes) }}> |
137 | 137 | {%- if attributes.divider is defined and attributes.divider is not empty %} |
138 | | - {%- elseif item.hasChildren and options.style is defined and options.style in ['tabs', 'justified-tabs', 'pills', 'justified-pills', 'navbar', 'navbar-right', 'navbar_justified'] and options.currentDepth is sameas(1) %} |
| 138 | + {%- elseif item.hasChildren and options.style is defined and options.style in ['tabs', 'justified-tabs', 'pills', 'justified-pills', 'navbar', 'navbar-right', 'navbar_justified'] and options.currentDepth is sameas(1) and ((item.extras.dropdown is not defined and item.displayChildren is sameas(true) or item.extras.dropdown is defined and item.extras.dropdown is sameas(true) and item.displayChildren is sameas(true))) %} |
139 | 139 | {{ block('dropdownElement') }} |
140 | 140 | {%- elseif item.uri is not empty and ((matcher is defined and not matcher.isCurrent(item)) or options.currentAsLink) %} |
141 | 141 | {{ block('linkElement') }} |
|
0 commit comments