github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prefer a {window} explicitly provided to openPaths()

Browse Source
This commit is contained in:
Ash Wilson
2019-04-10 16:08:59 -04:00
parent a0f41e7d82
commit e39b12b165
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main-process/atom-application.js
View File

@@ -968,11 +968,21 @@ class AtomApplication extends EventEmitter {
const normalizedPathsToOpen = locationsToOpen.map(location => location.pathToOpen).filter(Boolean)
let existingWindow
if (!newWindow && normalizedPathsToOpen.length > 0) {
// Explicitly provided AtomWindow has precedence unless a new window is forced.
if (!newWindow) {
existingWindow = window
}
// If no window is specified, a new window is not forced, and at least one path is provided, locate
// an existing window that contains all paths.
if (!existingWindow && !newWindow && normalizedPathsToOpen.length > 0) {
existingWindow = this.windowForPaths(normalizedPathsToOpen, devMode)
}
if (addToLastWindow && !existingWindow) {
// No window specified, new window not forced, no existing window found, and addition to the last window
// requested. Find the last focused window.
if (!existingWindow && !newWindow && addToLastWindow) {
let lastWindow = window || this.getLastFocusedWindow()
if (lastWindow && lastWindow.devMode === devMode) {
existingWindow = lastWindow