fix not working timezone selectbox in topmenu (whole menu was hidden on click)

This commit is contained in:
Ralf Becker 2020-01-10 10:56:59 +01:00
parent 257fa50a1f
commit 6113706921
2 changed files with 6 additions and 2 deletions

View File

@ -1055,7 +1055,9 @@
window.callManual = window.framework.callManual; window.callManual = window.framework.callManual;
jQuery('#egw_fw_print').click(function(){window.framework.print();}); jQuery('#egw_fw_print').click(function(){window.framework.print();});
jQuery('#topmenu_logout').click(function(){ window.framework.redirect(this.getAttribute('href')); return false;}); jQuery('#topmenu_logout').click(function(){ window.framework.redirect(this.getAttribute('href')); return false;});
jQuery('form[name^="tz_selection"]').children().on('change', function(){framework.tzSelection(this.value); return false;}); jQuery('form[name^="tz_selection"]').children()
.on('change', function() { framework.tzSelection(this.value); return false; })
.on('click', function(e) { e.stopPropagation(); });
window.egw.link_quick_add('quick_add'); window.egw.link_quick_add('quick_add');
history.pushState({type:'main'}, 'main', '#main'); history.pushState({type:'main'}, 'main', '#main');
jQuery(window).on('popstate', function(e){ jQuery(window).on('popstate', function(e){

View File

@ -127,7 +127,9 @@
jQuery('#topmenu_info_user_avatar').click(function(){window.framework.toggle_avatar_menu();}); jQuery('#topmenu_info_user_avatar').click(function(){window.framework.toggle_avatar_menu();});
jQuery('#topmenu_info_print_title').click(function(){window.framework.print();}); jQuery('#topmenu_info_print_title').click(function(){window.framework.print();});
jQuery('#topmenu_info_logout').click(function(){ window.framework.redirect(this.getAttribute('data-logout-url')); }); jQuery('#topmenu_info_logout').click(function(){ window.framework.redirect(this.getAttribute('data-logout-url')); });
jQuery('form[name^="tz_selection"]').children().on('change', function(){framework.tzSelection(this.value); return false;}); jQuery('form[name^="tz_selection"]').children()
.on('change', function() { framework.tzSelection(this.value); return false; })
.on('click', function(e) { e.stopPropagation(); });
window.egw.link_quick_add('topmenu_info_quick_add'); window.egw.link_quick_add('topmenu_info_quick_add');
// allowing javascript urls in topmenu and sidebox only under CSP by binding click handlers to them // allowing javascript urls in topmenu and sidebox only under CSP by binding click handlers to them