diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index ef0edd3382..7371d5ee7c 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -5,6 +5,12 @@ frappe.ui.form.get_open_grid_form = function() { return $(".grid-row-open").data("grid_row"); } +frappe.ui.form.close_grid_form = function() { + var open_form = frappe.ui.form.get_open_grid_form(); + open_form && open_form.hide_form(); +} + + frappe.ui.form.Grid = Class.extend({ init: function(opts) { $.extend(this, opts); diff --git a/frappe/public/js/frappe/views/formview.js b/frappe/public/js/frappe/views/formview.js index 4ae99f8bd2..f3e85f6cb0 100644 --- a/frappe/public/js/frappe/views/formview.js +++ b/frappe/public/js/frappe/views/formview.js @@ -20,8 +20,7 @@ frappe.views.FormFactory = frappe.views.Factory.extend({ } $(document).on("page-change", function() { - var open_form = frappe.ui.form.get_open_grid_form(); - open_form && open_form.hide_form(); + frappe.ui.form.close_grid_form(); }); }, show_doc: function(route) { diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js index b4d4a762f1..a97bc52666 100644 --- a/frappe/public/js/legacy/form.js +++ b/frappe/public/js/legacy/form.js @@ -348,6 +348,7 @@ _f.Frm.prototype.refresh = function(docname) { scroll(0, 0); this.hide_print(); } + frappe.ui.form.close_grid_form(); this.docname = docname; } @@ -565,8 +566,7 @@ _f.Frm.prototype.save = function(save_action, callback, btn, on_error) { btn && $(btn).prop("disabled", true); $(document.activeElement).blur(); - var open_form = frappe.ui.form.get_open_grid_form(); - open_form && open_form.hide_form(); + frappe.ui.form.close_grid_form(); // let any pending js process finish var me = this;