Ticket #4405 - Menus: Don't show an empty onclick attribute.

unacms · Jul 24, 2023 · fb3759e · fb3759e
1 parent 2435f48
commit fb3759e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/modules/boonex/artificer/data/template/system/scripts/BxTemplMenuAccountNotifications.php b/modules/boonex/artificer/data/template/system/scripts/BxTemplMenuAccountNotifications.php
@@ -26,13 +26,13 @@ protected function _getMenuItem ($a)
         $a['class_add_a'] = '';
         switch ($a['name']) {
             case 'add-content':
-                if(isset($a['onclick']))
-                    $a['onclick'] = str_replace(['bx_menu_slide_inline', 'bx-menu-toolbar-item-add-content'], ['oBxArtificerUtils.getAddContentMenu', 'bx-menu-toolbar-item-account'], $a['onclick']);
+                if(isset($a['bx_if:onclick']['content']['onclick']))
+                    $a['bx_if:onclick']['content']['onclick'] = str_replace(['bx_menu_slide_inline', 'bx-menu-toolbar-item-add-content'], ['oBxArtificerUtils.getAddContentMenu', 'bx-menu-toolbar-item-account'], $a['bx_if:onclick']['content']['onclick']);
                 break;
 
             case 'notifications-notifications':
-                if(isset($a['onclick']))
-                    $a['onclick'] = str_replace(['bx_menu_slide', 'this'], ['oBxArtificerUtils.getNotificationsMenu', '$(\'#bx-menu-toolbar-item-account a\').get(0)'], $a['onclick']);
+                if(isset($a['bx_if:onclick']['content']['onclick']))
+                    $a['bx_if:onclick']['content']['onclick'] = str_replace(['bx_menu_slide', 'this'], ['oBxArtificerUtils.getNotificationsMenu', '$(\'#bx-menu-toolbar-item-account a\').get(0)'], $a['bx_if:onclick']['content']['onclick']);
                 break;
         }
 

diff --git a/modules/boonex/artificer/data/template/system/scripts/BxTemplMenuToolbar.php b/modules/boonex/artificer/data/template/system/scripts/BxTemplMenuToolbar.php
@@ -61,13 +61,13 @@ protected function _getMenuItem ($a)
             case 'add-content':
                 $a['class_add'] = str_replace('bx-def-media-phone-hide', '',  $a['class_add']);
 
-                if(isset($a['onclick']))
-                    $a['onclick'] = str_replace('bx_menu_slide_inline', 'bx_menu_popup_inline', $a['onclick']);
+                if(isset($a['bx_if:onclick']['content']['onclick']))
+                    $a['bx_if:onclick']['content']['onclick'] = str_replace('bx_menu_slide_inline', 'bx_menu_popup_inline', $a['bx_if:onclick']['content']['onclick']);
                 break;
 
             case 'notifications-preview':
-                if(isset($a['onclick']))
-                    $a['onclick'] = str_replace(["bx_menu_slide", "'site', "], ['bx_menu_popup'], $a['onclick']);
+                if(isset($a['bx_if:onclick']['content']['onclick']))
+                    $a['bx_if:onclick']['content']['onclick'] = str_replace(["bx_menu_slide", "'site', "], ['bx_menu_popup'], $a['bx_if:onclick']['content']['onclick']);
                 break;
         }