Skip to content
Snippets Groups Projects
Commit 006fc121 authored by Uma's avatar Uma
Browse files

Merge branch 'fix_1407' into '7.4.0'

Fix for #1407 - 7.3 beta: Filter UI is broken

See merge request !746
parents a51e8e4b 39e7065d
No related branches found
No related tags found
No related merge requests found
......@@ -135,7 +135,9 @@ var vtUtils = {
showShortcuts: true,
autoClose : false,
duration : 500
});
}).on('datepicker-opened', function(e){
vtUtils.addMask(jQuery('.date-picker-wrapper:visible'));
}).on('datepicker-closed',vtUtils.removeMask);
}else{
var elementDateFormat = element.data('dateFormat');
if(typeof elementDateFormat !== 'undefined') {
......@@ -375,5 +377,18 @@ var vtUtils = {
return string.replace(tags, function ($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
});
}
},
addMask: function (container) {
if (container.length && jQuery('#vt-mask').length == 0) {
var mask = '<div id="vt-mask" class="vt-page-mask" ></div>'
container.before(mask);
}
},
removeMask: function () {
if (jQuery('#vt-mask').length) {
jQuery('#vt-mask').remove();
}
},
}
......@@ -8675,4 +8675,20 @@ body .fc {
border-width: thin;
padding: 30px;
}
}
#vt-mask{
border: 0;
margin: 0;
padding: 0;
position: fixed;
left: 0;
top: 0;
min-height: 100%;
min-width: 100%;
height: auto;
width: auto;
opacity: 0;
z-index: 10001;
background-color: #fff;
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment