From 7b0f8f289637d06f610230a0fbe7cfe51cd53d6c Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Sep 2021 19:48:42 +0000 Subject: fix language selector reloading the page if not clicking the icon exactly and bs5 modal issues --- view/js/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/js') diff --git a/view/js/main.js b/view/js/main.js index f54dbf593..476e78056 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -87,8 +87,8 @@ $(document).ready(function() { if ( typeof(window.tao.zin) == 'undefined' ) { tao.zin = { syslc: '', syslcs: {}, htm: '', me: '', debug: '' }; tao.zin.axim = '
'; - $('.navbar-app[href*="/lang"]').attr({"data-toggle": "dropdown", "aria-expand": "true", "id": "zintog"}) - .removeAttr('href').addClass('zinlcx zinlcxp dropdown dropdown-toggle'); + $('.navbar-app[href*="/lang"]').attr({"aria-expand": "true", "id": "zintog"}) + .removeAttr('href').addClass('zinlcx zinlcxp dropdown dropdown-toggle').css('cursor','pointer'); $('.dropdown-item[href*="/lang"]').addClass('zinlcxmi zinlcx').removeAttr('href').css('cursor','pointer'); } $('.zinlcx').on('click', function(e) { @@ -108,11 +108,11 @@ $(document).ready(function() { tao.zin.htm += ''; $('.zinpax').remove(); $('.zinlcx').append(tao.zin.htm); - $('.zinlcxp > ul').addClass('dropdown dropdown-menu dropdown-menu-end').css('left','-16em'); + $('.zinlcxp > ul').addClass('dropdown dropdown-menu dropdown-menu-end mt-2 show').css('right', 0); }); return false; } else { - if (e.target.id == '') { + if (e.target.id == '' || e.target.id == 'zintog') { // noop click on lang again return false; } -- cgit v1.2.3