This commit is contained in:
Wliu
2017-11-19 00:35:40 +01:00
parent 3d9f6bc664
commit 131c13db3e
2 changed files with 16 additions and 16 deletions

View File

@@ -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
}

View File

@@ -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