From 4d8aa081748a722cb780ac702d201cdf37708681 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 6 May 2021 16:41:35 +0530 Subject: [PATCH 1/5] fix: minimize modal scroll issue --- frappe/public/js/frappe/ui/dialog.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 6761d1d326..445cc32792 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -232,6 +232,8 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.get_minimize_btn().html(frappe.utils.icon(icon)); this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized); this.header.find('.modal-title').toggleClass('cursor-pointer'); + var body = $("body"); + body.hasClass("modal-open") ? body.removeClass("modal-open") : body.addClass("modal-open"); } add_custom_action(label, action, css_class=null) { From a7833ed97a4fb89e39580db2793f9042c1c61597 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 6 May 2021 17:59:26 +0530 Subject: [PATCH 2/5] fix: code style --- frappe/public/js/frappe/ui/dialog.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 445cc32792..0cc3728115 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -232,8 +232,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.get_minimize_btn().html(frappe.utils.icon(icon)); this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized); this.header.find('.modal-title').toggleClass('cursor-pointer'); - var body = $("body"); - body.hasClass("modal-open") ? body.removeClass("modal-open") : body.addClass("modal-open"); + $("body").toggleClass("modal-open", !this.is_minimized); } add_custom_action(label, action, css_class=null) { From cd87b5e8ca3a187b5157d37ccd19906292ad4a79 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 6 May 2021 20:11:40 +0530 Subject: [PATCH 3/5] fix: changing overflow instead of removing class --- frappe/public/js/frappe/ui/dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 0cc3728115..12623fb40c 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -232,7 +232,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.get_minimize_btn().html(frappe.utils.icon(icon)); this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized); this.header.find('.modal-title').toggleClass('cursor-pointer'); - $("body").toggleClass("modal-open", !this.is_minimized); + this.is_minimized ? $("body").css("overflow","auto") : $("body").css("overflow", "hidden") } add_custom_action(label, action, css_class=null) { From aa0b7a08ddbb5a920afa5a9ee616b699794c3bc2 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 6 May 2021 20:22:46 +0530 Subject: [PATCH 4/5] fix: sider --- frappe/public/js/frappe/ui/dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index 12623fb40c..f0cb871aa1 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -232,7 +232,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.get_minimize_btn().html(frappe.utils.icon(icon)); this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized); this.header.find('.modal-title').toggleClass('cursor-pointer'); - this.is_minimized ? $("body").css("overflow","auto") : $("body").css("overflow", "hidden") + this.is_minimized ? $("body").css("overflow", "auto") : $("body").css("overflow", "hidden"); } add_custom_action(label, action, css_class=null) { From 0f53dd1bdc92e66f4154c0e6bc75fce6c91acb87 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 7 May 2021 18:48:03 +0530 Subject: [PATCH 5/5] fix: code style --- frappe/public/js/frappe/ui/dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index f0cb871aa1..25044de478 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -232,7 +232,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { this.get_minimize_btn().html(frappe.utils.icon(icon)); this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized); this.header.find('.modal-title').toggleClass('cursor-pointer'); - this.is_minimized ? $("body").css("overflow", "auto") : $("body").css("overflow", "hidden"); + $("body").css("overflow", this.is_minimized ? "auto" : "hidden"); } add_custom_action(label, action, css_class=null) {