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

fix: set window to null when no window is passed (#18240)

Browse source 
* fix: set window to null when no window is passed

* add new specs for dialog

* fix process blocking for showMessageBox
This commit is contained in:
Shelley Vohr 2019-05-21 07:08:22 -07:00 • committed by Charles Kerr
parent e73a0e6cc6
commit 1a2ab11c90
2 changed files with 73 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/browser/api/dialog.js
View file

@ -47,7 +47,11 @@ const checkAppInitialized = function () {
const saveDialog = (sync, window, options) => {
checkAppInitialized()
if (window && window.constructor !== BrowserWindow) options = window
if (window && window.constructor !== BrowserWindow) {
options = window
window = null
}
if (options == null) options = { title: 'Save' }
const {
@ -74,7 +78,11 @@ const saveDialog = (sync, window, options) => {
const openDialog = (sync, window, options) => {
checkAppInitialized()
if (window && window.constructor !== BrowserWindow) options = window
if (window && window.constructor !== BrowserWindow) {
options = window
window = null
}
if (options == null) {
options = {
title: 'Open',
@ -115,7 +123,11 @@ const openDialog = (sync, window, options) => {
const messageBox = (sync, window, options) => {
checkAppInitialized()
if (window && window.constructor !== BrowserWindow) options = window
if (window && window.constructor !== BrowserWindow) {
options = window
window = null
}
if (options == null) options = { type: 'none' }
const messageBoxTypes = ['none', 'info', 'warning', 'error', 'question']