X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2Fcrm.menubar.js;h=d28f0983498f6a908f41c5b3839575871977f3ba;hb=5e884aa11e68bdba189d729d6cf6c17abf9956df;hp=9fa49f63d69a5fc0d23f4bdf21f3c9ea74eec42f;hpb=f0be7552105c404ee068bcaabc811180c4d45bb6;p=civicrm-core.git diff --git a/js/crm.menubar.js b/js/crm.menubar.js index 9fa49f63d6..d28f098349 100644 --- a/js/crm.menubar.js +++ b/js/crm.menubar.js @@ -8,6 +8,7 @@ data: null, settings: {collapsibleBehavior: 'accordion'}, position: 'over-cms-menu', + toggleButton: true, attachTo: (CRM.menubar && CRM.menubar.position === 'above-crm-container') ? '#crm-container' : 'body', initialize: function() { var cache = CRM.cache.get('menubar'); @@ -78,12 +79,17 @@ }) .on('show.smapi', function(e, menu) { // Focus menu when opened with an accesskey - $(menu).siblings('a[accesskey]').focus(); + if ($(menu).parent().data('name') === 'Home') { + $('#crm-menubar-drilldown').focus(); + } else { + $(menu).siblings('a[accesskey]').focus(); + } }) .smartmenus(CRM.menubar.settings); initialized = true; CRM.menubar.initializeResponsive(); CRM.menubar.initializeSearch(); + CRM.menubar.initializeDrill(); }); } }, @@ -144,6 +150,9 @@ getItem: function(itemName) { return traverse(CRM.menubar.data.menu, itemName, 'get'); }, + findItems: function(searchTerm) { + return findRecursive(CRM.menubar.data.menu, searchTerm.toLowerCase().replace(/ /g, '')); + }, addItems: function(position, targetName, items) { var list, container, $ul; if (position === 'before' || position === 'after') { @@ -223,17 +232,24 @@ } }, initializePosition: function() { - if (CRM.menubar.position === 'over-cms-menu' || CRM.menubar.position === 'below-cms-menu') { + if (CRM.menubar.toggleButton && (CRM.menubar.position === 'over-cms-menu' || CRM.menubar.position === 'below-cms-menu')) { $('#civicrm-menu') .on('click', 'a[href="#toggle-position"]', function(e) { e.preventDefault(); CRM.menubar.togglePosition(); }) - .append('