From 39e7065d0490dfa31f94018dc497b4fd6fb413f2 Mon Sep 17 00:00:00 2001
From: akshath <akshath.t@vtiger.com>
Date: Thu, 29 Oct 2020 12:26:09 +0530
Subject: [PATCH] Fix for #1407 - 7.3 beta: Filter UI is broken
---
layouts/v7/modules/Vtiger/resources/Utils.js | 19 +++++++++++++++++--
layouts/v7/skins/vtiger/style.less | 16 ++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/resources/Utils.js b/layouts/v7/modules/Vtiger/resources/Utils.js
index c51009b48..a19b41474 100644
--- a/layouts/v7/modules/Vtiger/resources/Utils.js
+++ b/layouts/v7/modules/Vtiger/resources/Utils.js
@@ -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();
+ }
+ },
}
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index bb8ce4247..7320815f2 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -8665,4 +8665,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
--
GitLab