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

Resolved native menu issues. #5503

Browse Source
This commit is contained in:
Nikhil Mohite
2022-12-07 18:47:38 +05:30
committed by GitHub
parent 822593d761
commit b172cd6a16
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,8 +478,8 @@ define('pgadmin.browser', [
let {name: browser} = getBrowser();
if(browser == 'Nwjs') {
pgBrowser.MainMenus.forEach((menu) => {
menu.menuItems.forEach((item) => {
item.setDisabled(item.disabled(d, item));
menu.menuItems.forEach((_item) => {
_item.setDisabled(_item.disabled(d, item));
});
});
}else {

18
web/pgadmin/browser/static/js/main_menu.js
View File

@@ -28,22 +28,22 @@ export default function createMainMenus() {
// Don't add menuItems for Object menu as it's menuItems get changed on tree selection.
if(_menu.name !== 'object') {
menuObj.addMenuItems(Object.values(pgAdmin.Browser.menus[_menu.name]));
let priority = null;
menuObj.menuItems.forEach((menuItem, index)=> {
if(index == 0) {
priority = menuItem.priority;
menuItem?.menu_items?.forEach((item, indx)=> {
item.below && menuItem?.menu_items.splice(indx+1, 0, getSeparator());
});
if(menuItem.below) {
menuObj.addMenuItem(getSeparator(), index+1);
}
if(priority !== menuItem.priority) {
let separateMenuItem = new MenuItem({type: 'separator'});
menuObj.addMenuItem(separateMenuItem, index);
}
});
}
});
}
function getSeparator() {
return new MenuItem({type: 'separator'});
}
export function refreshMainMenuItems(menu, menuItems) {
if(browser == 'Nwjs') {
menu.setMenuItems(menuItems);

2
web/pgadmin/browser/static/js/quick_search/menuitems_help.js
View File

@@ -55,7 +55,7 @@ export function menuSearch(param, props) {
// Starting Point
let {name: browser} = getBrowser();
const mainMenus = browser == 'Nwjs' ?pgAdmin.Browser.MainMenus : MainMenus;
const mainMenus = browser == 'Nwjs' ? pgAdmin.Browser.MainMenus : MainMenus;
if(browser == 'Nwjs') {
mainMenus.forEach((menu) => {
let subMenus = menu.menuItems;