IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove hacky way to open/close the dropdown submenu

Browse Source
This commit is contained in:
Ashesh Vashi 2019-01-31 17:49:41 +05:30 committed by Akshay Joshi
parent 6244463ac1
commit 38feacd04d
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/pgadmin/browser/static/js/browser.js
View File

@ -349,7 +349,6 @@ define('pgadmin.browser', [
}], false); }], false);
$obj_mnu.append(create_submenu.$el); $obj_mnu.append(create_submenu.$el);
} }
pgAdmin.Browser.SubmenuEvents($obj_mnu);
}, },
save_current_layout: function(obj) { save_current_layout: function(obj) {
if(obj.docker) { if(obj.docker) {

48
web/pgadmin/browser/static/js/menu.js
View File

@ -347,31 +347,6 @@ define([
return (len > 0); return (len > 0);
}; };
pgAdmin.Browser.SubmenuEvents = function($mnu) {
let subMenuClose = function(event) {
let $dropDown = $(event.currentTarget).closest('.dropdown');
$dropDown.find('.dropdown-submenu .dropdown-menu').removeClass('show');
$dropDown.find('.dropdown-submenu').removeClass('dropdown-submenu-visible');
};
let $navlink = $mnu.siblings('.nav-link');
$navlink.off('click', subMenuClose).on('click', subMenuClose);
$mnu.parent('.dropdown').off('show.bs.dropdown',subMenuClose)
.on('show.bs.dropdown',subMenuClose);
$mnu.find('.dropdown-item').off('mouseover').on('mouseover', (event)=> {
let $dropSubMenu = $(event.currentTarget).closest('.dropdown-menu').find('.dropdown-submenu');
/* Close all other submenus if any */
$dropSubMenu.find('.dropdown-menu').removeClass('show');
$dropSubMenu.removeClass('dropdown-submenu-visible');
/* Open the current submenu if any */
if($(event.currentTarget).parent().hasClass('dropdown-submenu')){
$(event.currentTarget).parent().find('.dropdown-menu').addClass('show');
$(event.currentTarget).parent().addClass('dropdown-submenu-visible');
}
});
};
// MENU PUBLIC CLASS DEFINITION // MENU PUBLIC CLASS DEFINITION
// ============================== // ==============================
var Menu = function(element, options) { var Menu = function(element, options) {
@ -388,6 +363,7 @@ define([
ev.preventDefault(); ev.preventDefault();
return false; return false;
} }
var d = this.$element.data('pgMenu'); var d = this.$element.data('pgMenu');
if (d.cb) { if (d.cb) {
var cb = d.module && d.module['callbacks'] && d.module['callbacks'][d.cb] || d.module && d.module[d.cb]; var cb = d.module && d.module['callbacks'] && d.module['callbacks'][d.cb] || d.module && d.module[d.cb];
@ -443,10 +419,26 @@ define([
.on( .on(
'focus.pg.menu.data-api blur.pg.menu.data-api', 'focus.pg.menu.data-api blur.pg.menu.data-api',
'[data-toggle^="pg-menu"]', '[data-toggle^="pg-menu"]',
function(e) { function(ev) {
$(e.target).closest('.menu').toggleClass( $(ev.target).closest('.menu').toggleClass(
'focus', /^focus(in)?$/.test(e.type) 'focus', /^focus(in)?$/.test(ev.type)
); );
})
.on('mouseenter', '.dropdown-submenu', function(ev) {
$(ev.currentTarget).removeClass('dropdown-submenu-visible')
.addClass('dropdown-submenu-visible');
$(ev.currentTarget).find('.dropdown-menu').first().addClass('show');
})
.on('mouseleave', '.dropdown-submenu', function(ev) {
$(ev.currentTarget).removeClass('dropdown-submenu-visible');
$(ev.currentTarget).find('.dropdown-menu').first().removeClass('show');
})
.on('hidden.bs.dropdown', function(ev) {
$(ev.target)
.find('.dropdown-submenu.dropdown-submenu-visible')
.removeClass('dropdown-submenu-visible')
.find('.dropdown-menu.show')
.removeClass('show');
}); });
return pgAdmin.Browser.MenuItem; return pgAdmin.Browser.MenuItem;