Commit b95c61d2 authored by Mario's avatar Mario
Browse files

fix language selector reloading the page if not clicking the icon exactly and bs5 modal issues


(cherry picked from commit 7b0f8f28)
parent 4c5f0a05
......@@ -87,8 +87,8 @@ $(document).ready(function() {
if ( typeof(window.tao.zin) == 'undefined' ) {
tao.zin = { syslc: '', syslcs: {}, htm: '', me: '', debug: '' };
tao.zin.axim = '<div class="zinpax fa fa-sync fa-spin"> </div>';
$('.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 += '</ul>';
$('.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;
}
......
......@@ -185,7 +185,7 @@ var activeCommentText = '';
function jotGetExpiry() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#expiryModal').modal();
$('#expiryModal').modal('show');
$('#expiry-modal-OKButton').on('click', function() {
reply=$('#expiration-date').val();
if(reply && reply.length) {
......@@ -197,7 +197,7 @@ var activeCommentText = '';
function jotGetPubDate() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#createdModal').modal();
$('#createdModal').modal('show');
$('#created-modal-OKButton').on('click', function() {
reply=$('#created-date').val();
if(reply && reply.length) {
......
......@@ -323,7 +323,7 @@
wiki_revert_page(compareCommit);
$('#generic-modal-{{$wikiModalID}}').modal('hide');
});
$('#generic-modal-{{$wikiModalID}}').modal();
$('#generic-modal-{{$wikiModalID}}').modal('show');
} else {
window.console.log('Error comparing page.');
}
......@@ -364,7 +364,7 @@
});
getPhotoAlbumList();
$('#embedPhotoModalBodyAlbumDialog').off('click');
$('#embedPhotoModal').modal();
$('#embedPhotoModal').modal('show');
};
var choosePhotoFromAlbum = function (album) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment