mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

standardize more

Browse source
This commit is contained in:
Zeke Sikelianos 2016-03-28 13:19:41 -07:00 • committed by Kevin Sawicki
parent 3a55f0d1f7
commit 68510cbe49
2 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
default_app/main.js
View file

@ -100,29 +100,21 @@ app.once('ready', function () {
{
label: 'Toggle Full Screen',
accelerator: (function () {
if (process.platform === 'darwin')
return 'Ctrl+Command+F'
else
return 'F11'
return (process.platform === 'darwin') ? 'Ctrl+Command+F' : 'F11'
})(),
click: function (item, focusedWindow) {
if (focusedWindow)
focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
if (focusedWindow) focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
}
},
{
label: 'Toggle Developer Tools',
accelerator: (function () {
if (process.platform === 'darwin')
return 'Alt+Command+I'
else
return 'Ctrl+Shift+I'
return (process.platform === 'darwin') ? 'Alt+Command+I' : 'Ctrl+Shift+I'
})(),
click: function (item, focusedWindow) {
if (focusedWindow)
focusedWindow.toggleDevTools()
if (focusedWindow) focusedWindow.toggleDevTools()
}
},
}
]
},
{
@ -138,7 +130,7 @@ app.once('ready', function () {
label: 'Close',
accelerator: 'CmdOrCtrl+W',
role: 'close'
},
}
]
},
{
@ -172,7 +164,7 @@ app.once('ready', function () {
}
}
]
},
}
]
if (process.platform === 'darwin') {
@ -214,8 +206,8 @@ app.once('ready', function () {
{
label: 'Quit',
accelerator: 'Command+Q',
click: function () { app.quit(); }
},
click: function () { app.quit() }
}
]
})
template[3].submenu.push(
@ -244,12 +236,14 @@ function loadApplicationPackage (packagePath) {
var packageJsonPath = path.join(packagePath, 'package.json')
if (fs.existsSync(packageJsonPath)) {
var packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
if (packageJson.version)
app.setVersion(packageJson.version)
if (packageJson.productName)
if (packageJson.version) app.setVersion(packageJson.version)
if (packageJson.productName) {
app.setName(packageJson.productName)
else if (packageJson.name)
} else if (packageJson.name) {
app.setName(packageJson.name)
}
app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
app.setAppPath(packagePath)