fixes after tests

ibexa · Sep 15, 2022 · ae94c07 · ae94c07
1 parent 1030be3
commit ae94c07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/admin.anchor.navigation.js b/src/bundle/Resources/public/js/scripts/admin.anchor.navigation.js
@@ -108,6 +108,11 @@
         const contentColumn = doc.querySelector('.ibexa-main-container__content-column');
         const firstSection = getFirstSection(sectionGroup);
         const lastSection = getLastSection(sectionGroup);
+
+        if (!firstSection) {
+            return;
+        }
+
         const contentContainer = lastSection.closest('.ibexa-edit-content__container');
 
         contentContainer.style.paddingBottom = '0px';

diff --git a/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig b/src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig
@@ -36,6 +36,7 @@
             {%- set itemClass = itemClass ~ ' ibexa-anchor-navigation-menu__section-groups-item--active' %}
         {%- endif %}
         {%- do item.setAttribute('class', (item.getAttribute('class') ~ ' ' ~ itemClass)|trim) -%}
+        {%- do item.setAttribute('data-target-id', "#" ~ item.getAttribute('data-target-id')) -%}
         {%- do item.setAttribute('type', 'button') -%}
         {{ block('anchor_menu_item') }}
     {% endfor %}
@@ -162,7 +163,7 @@
 
 {% block root %}
     <div class="ibexa-anchor-navigation">
-        {% if item.count() < 2 %}
+        {% if item.count() < 4 %}
             {% set listAttributes = item.childrenAttributes|merge({'class': (listAttributes.class|default('') ~ ' ibexa-anchor-navigation-menu__section-groups ibexa-anchor-navigation-menu__section-groups--list')|trim}) %}
             {% set innerChildrenBlock = 'children_1st_level' %}
             {% set innerItemBlock = 'item_1st_level' %}
@@ -179,7 +180,7 @@
 
         {% for item in item.children %}
             {% if item.children|length > 1 %}
-                {% set listAttributes = {'class': 'ibexa-anchor-navigation-menu__sections' ~ (loop.first ? ' ibexa-anchor-navigation-menu__sections--active' : ''), 'data-id': "#" ~ item.getAttribute('data-target-id')} %}
+                {% set listAttributes = {'class': 'ibexa-anchor-navigation-menu__sections' ~ (loop.first ? ' ibexa-anchor-navigation-menu__sections--active' : ''), 'data-id': item.getAttribute('data-target-id')} %}
                 {% set innerChildrenBlock = 'children_2nd_level' %}
                 {% set innerItemBlock = 'item_2nd_level' %}
                 {% set tagElement = 'ul' %}