diff --git a/frappe/desk/page/modules/modules.js b/frappe/desk/page/modules/modules.js index 0eb4e0f5f0..0558101952 100644 --- a/frappe/desk/page/modules/modules.js +++ b/frappe/desk/page/modules/modules.js @@ -34,7 +34,6 @@ frappe.pages['modules'].on_page_load = function(wrapper) { page.wrapper.find('.module-sidebar-item.active, .module-link.active').removeClass('active'); $(link).addClass('active').parent().addClass("active"); show_section($(link).attr('data-name')); - $('.module-sidebar-nav').trigger('close_sidebar'); } var show_section = function(module_name) { diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index c81731799e..b3e12fbbcf 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -162,7 +162,6 @@ frappe.views.ListSidebar = Class.extend({ var fieldname = $(this).attr('data-field'); var label = $(this).attr('data-label'); me.set_filter(fieldname, label); - return false; }) .appendTo(this.sidebar); }, diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index 3628ddcd30..7054898e53 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -22,14 +22,13 @@ frappe.ui.toolbar.Toolbar = Class.extend({ offcanvas_container.css("overflow-y", "hidden"); layout_side_section.find(".close-sidebar").on('click', close_sidebar); + layout_side_section.on("click", "a", close_sidebar); - $('.module-sidebar-nav').on('close_sidebar', close_sidebar); - - function close_sidebar() { - overlay_sidebar.removeClass('opened').find('.dropdown-toggle').removeClass('text-muted'); + function close_sidebar(e) { offcanvas_container.css("overflow-y", "visible"); layout_side_section.find(".close-sidebar").fadeOut(function() { + overlay_sidebar.removeClass('opened').find('.dropdown-toggle').removeClass('text-muted'); overlay_sidebar.find('.reports-dropdown').addClass('dropdown-menu'); }); }