projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17308 from colemanw/BAOcleanup
[civicrm-core.git]
/
js
/
crm.menubar.js
diff --git
a/js/crm.menubar.js
b/js/crm.menubar.js
index eba37ed3c46d6c90b6281b3be088900ce874018a..1d4f753838ae2549258e3b5906a8033446a7681a 100644
(file)
--- a/
js/crm.menubar.js
+++ b/
js/crm.menubar.js
@@
-8,6
+8,7
@@
data: null,
settings: {collapsibleBehavior: 'accordion'},
position: 'over-cms-menu',
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');
attachTo: (CRM.menubar && CRM.menubar.position === 'above-crm-container') ? '#crm-container' : 'body',
initialize: function() {
var cache = CRM.cache.get('menubar');
@@
-231,17
+232,24
@@
}
},
initializePosition: function() {
}
},
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();
})
$('#civicrm-menu')
.on('click', 'a[href="#toggle-position"]', function(e) {
e.preventDefault();
CRM.menubar.togglePosition();
})
- .append('<li id="crm-menubar-toggle-position"><a href="#toggle-position" title="' + ts('Adjust menu position') + '"><i class="crm-i fa-arrow-up"></i></a>');
+ .append('<li id="crm-menubar-toggle-position"><a href="#toggle-position" title="' + ts('Adjust menu position') + '"><i class="crm-i fa-arrow-up"
aria-hidden="true"
></i></a>');
CRM.menubar.position = CRM.cache.get('menubarPosition', CRM.menubar.position);
}
$('body').addClass('crm-menubar-visible crm-menubar-' + CRM.menubar.position);
},
CRM.menubar.position = CRM.cache.get('menubarPosition', CRM.menubar.position);
}
$('body').addClass('crm-menubar-visible crm-menubar-' + CRM.menubar.position);
},
+ removeToggleButton: function() {
+ $('#crm-menubar-toggle-position').remove();
+ CRM.menubar.toggleButton = false;
+ if (CRM.menubar.position === 'below-cms-menu') {
+ CRM.menubar.togglePosition();
+ }
+ },
initializeResponsive: function() {
var $mainMenuState = $('#crm-menubar-state');
// hide mobile menu beforeunload
initializeResponsive: function() {
var $mainMenuState = $('#crm-menubar-state');
// hide mobile menu beforeunload