github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pass the load settings through so all windows share devMode and safeMode

Browse Source
This commit is contained in:
Ben Ogle
2014-12-18 16:45:07 -08:00
parent e688df57f2
commit 80c828d001
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/browser/atom-application.coffee
View File

@@ -145,9 +145,9 @@ class AtomApplication
@on 'application:quit', -> app.quit()
@on 'application:new-window', -> @openPath(windowDimensions: @focusedWindow()?.getDimensions())
@on 'application:new-file', -> (@focusedWindow() ? this).openPath()
@on 'application:open', -> @promptForPath(type: 'all')
@on 'application:open-file', -> @promptForPath(type: 'file')
@on 'application:open-folder', -> @promptForPath(type: 'folder')
@on 'application:open', (loadSettings) -> @promptForPath(_.extend(type: 'all', loadSettings))
@on 'application:open-file', (loadSettings) -> @promptForPath(_.extend(type: 'file', loadSettings))
@on 'application:open-folder', (loadSettings) -> @promptForPath(_.extend(type: 'folder', loadSettings))
@on 'application:open-dev', -> @promptForPath(devMode: true)
@on 'application:open-safe', -> @promptForPath(safeMode: true)
@on 'application:inspect', ({x,y, atomWindow}) ->
@@ -227,8 +227,8 @@ class AtomApplication
ipc.on 'run-package-specs', (event, specDirectory) =>
@runSpecs({resourcePath: global.devResourcePath, specDirectory: specDirectory, exitWhenDone: false})
ipc.on 'command', (event, command) =>
@emit(command)
ipc.on 'command', (event, command, options) =>
@emit(command, options)
ipc.on 'window-command', (event, command, args...) ->
win = BrowserWindow.fromWebContents(event.sender)

6
src/workspace-element.coffee
View File

@@ -131,9 +131,9 @@ atom.commands.add 'atom-workspace',
'application:unhide-all-applications': -> ipc.send('command', 'application:unhide-all-applications')
'application:new-window': -> ipc.send('command', 'application:new-window')
'application:new-file': -> ipc.send('command', 'application:new-file')
'application:open': -> ipc.send('command', 'application:open')
'application:open-file': -> ipc.send('command', 'application:open-file')
'application:open-folder': -> ipc.send('command', 'application:open-folder')
'application:open': -> ipc.send('command', 'application:open', devMode: atom.inDevMode(), safeMode: atom.inSafeMode())
'application:open-file': -> ipc.send('command', 'application:open-file', devMode: atom.inDevMode(), safeMode: atom.inSafeMode())
'application:open-folder': -> ipc.send('command', 'application:open-folder', devMode: atom.inDevMode(), safeMode: atom.inSafeMode())
'application:open-dev': -> ipc.send('command', 'application:open-dev')
'application:open-safe': -> ipc.send('command', 'application:open-safe')
'application:minimize': -> ipc.send('command', 'application:minimize')