mirror of
https://github.com/atom/atom.git
synced 2026-01-26 15:28:27 -05:00
🎨
This commit is contained in:
@@ -1088,23 +1088,23 @@ class AtomEnvironment {
|
||||
buttons: [
|
||||
'&Open in new window and recover state',
|
||||
'&Add to this window and discard state'
|
||||
]}, response => {
|
||||
if (choice === 0) {
|
||||
this.open({
|
||||
pathsToOpen: projectPaths.concat(filesToOpen),
|
||||
newWindow: true,
|
||||
devMode: this.inDevMode(),
|
||||
safeMode: this.inSafeMode()
|
||||
})
|
||||
resolveDiscardStatePromise(Promise.resolve(null))
|
||||
} else if (choice === 1) {
|
||||
for (let selectedPath of projectPaths) {
|
||||
this.project.addPath(selectedPath)
|
||||
}
|
||||
resolveDiscardStatePromise(Promise.all(filesToOpen.map(file => this.workspace.open(file))))
|
||||
]
|
||||
}, response => {
|
||||
if (response === 0) {
|
||||
this.open({
|
||||
pathsToOpen: projectPaths.concat(filesToOpen),
|
||||
newWindow: true,
|
||||
devMode: this.inDevMode(),
|
||||
safeMode: this.inSafeMode()
|
||||
})
|
||||
resolveDiscardStatePromise(Promise.resolve(null))
|
||||
} else if (response === 1) {
|
||||
for (let selectedPath of projectPaths) {
|
||||
this.project.addPath(selectedPath)
|
||||
}
|
||||
resolveDiscardStatePromise(Promise.all(filesToOpen.map(file => this.workspace.open(file))))
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
return discardStatePromise
|
||||
}
|
||||
|
||||
@@ -1216,7 +1216,7 @@ module.exports = class Workspace extends Model {
|
||||
|
||||
const largeFileMode = fileSize >= (2 * 1048576) // 2MB
|
||||
|
||||
let resolveConfirmFileOpenPromise, rejectConfirmFileOpenPromise = []
|
||||
let [resolveConfirmFileOpenPromise, rejectConfirmFileOpenPromise] = []
|
||||
const confirmFileOpenPromise = new Promise((resolve, reject) => {
|
||||
resolveConfirmFileOpenPromise = resolve
|
||||
rejectConfirmFileOpenPromise = reject
|
||||
|
||||
Reference in New Issue
Block a user