@allow-large-files [flipper][deps] Upgrade Electron (#636)
Summary: allow-large-files Pull Request resolved: https://github.com/facebook/flipper/pull/636 per title Reviewed By: jknoxville Differential Revision: D18374332 fbshipit-source-id: f7300f527b65b65caebac51c5bcf8f019dc34228
This commit is contained in:
committed by
Facebook Github Bot
parent
0914deda2d
commit
a578b4d559
@@ -107,7 +107,7 @@ export function setupMenuBar(
|
||||
const menu = applicationMenu.items.find(
|
||||
menuItem => menuItem.label === topLevelMenu,
|
||||
);
|
||||
if (menu) {
|
||||
if (menu && menu.submenu) {
|
||||
const menuItem = menu.submenu.items.find(
|
||||
menuItem => menuItem.label === label,
|
||||
);
|
||||
@@ -187,14 +187,17 @@ function getTemplate(
|
||||
label: 'File...',
|
||||
accelerator: 'CommandOrControl+E',
|
||||
click: function() {
|
||||
electron.remote.dialog.showSaveDialog(
|
||||
// @ts-ignore This appears to work but isn't allowed by the types
|
||||
null,
|
||||
{
|
||||
title: 'FlipperExport',
|
||||
defaultPath: path.join(os.homedir(), 'FlipperExport.flipper'),
|
||||
},
|
||||
async (file: string) => {
|
||||
electron.remote.dialog
|
||||
.showSaveDialog(
|
||||
// @ts-ignore This appears to work but isn't allowed by the types
|
||||
null,
|
||||
{
|
||||
title: 'FlipperExport',
|
||||
defaultPath: path.join(os.homedir(), 'FlipperExport.flipper'),
|
||||
},
|
||||
)
|
||||
.then(async (result: electron.SaveDialogReturnValue) => {
|
||||
const file = result.filePath;
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
@@ -205,8 +208,7 @@ function getTemplate(
|
||||
closeOnFinish: false,
|
||||
}),
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
},
|
||||
},
|
||||
];
|
||||
@@ -297,7 +299,7 @@ function getTemplate(
|
||||
{
|
||||
label: 'Select All',
|
||||
accelerator: 'CmdOrCtrl+A',
|
||||
role: 'selectall',
|
||||
role: 'selectAll',
|
||||
},
|
||||
],
|
||||
},
|
||||
@@ -411,7 +413,7 @@ function getTemplate(
|
||||
];
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
const name = app.getName();
|
||||
const name = app.name;
|
||||
template.unshift({
|
||||
label: name,
|
||||
submenu: [
|
||||
@@ -438,7 +440,7 @@ function getTemplate(
|
||||
{
|
||||
label: 'Hide Others',
|
||||
accelerator: 'Command+Shift+H',
|
||||
role: 'hideothers',
|
||||
role: 'hideOthers',
|
||||
},
|
||||
{
|
||||
label: 'Show All',
|
||||
|
||||
Reference in New Issue
Block a user