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

Make dialog.showSaveDialog accept no parent window.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-23 19:59:00 +08:00
parent e824b6c910
commit 30ca085fd8
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
browser/api/atom_api_dialog.cc
View file

@ -189,20 +189,24 @@ v8::Handle<v8::Value> ShowOpenDialog(const v8::Arguments &args) {
v8::Handle<v8::Value> ShowSaveDialog(const v8::Arguments &args) {
v8::HandleScope scope;
if (!args[0]->IsObject() || // window
!args[1]->IsString() || // title
!args[2]->IsString()) // default_path
if (!args[0]->IsString() || // title
!args[1]->IsString()) // default_path
return node::ThrowTypeError("Bad argument");
Window* window = Window::Unwrap<Window>(args[0]->ToObject());
if (!window || !window->window())
return node::ThrowError("Invalid window");
NativeWindow* native_window = NULL;
if (args[2]->IsObject()) {
Window* window = Window::Unwrap<Window>(args[2]->ToObject());
if (!window || !window->window())
return node::ThrowError("Invalid window");
std::string title(*v8::String::Utf8Value(args[1]));
base::FilePath default_path(V8ValueToFilePath(args[2]));
native_window = window->window();
}
std::string title(*v8::String::Utf8Value(args[0]));
base::FilePath default_path(V8ValueToFilePath(args[1]));
base::FilePath path;
if (!file_dialog::ShowSaveDialog(window->window(),
if (!file_dialog::ShowSaveDialog(native_window,
title,
default_path,
&path))

15
browser/api/lib/dialog.coffee
View file

@ -31,16 +31,21 @@ module.exports =
window,
callback
showSaveDialog: (window, options) ->
throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow
showSaveDialog: (window, options, callback) ->
unless window?.constructor is BrowserWindow
# Shift.
callback = options
options = window
window = null
options ?= title: 'Save'
options.title ?= ''
options.defaultPath ?= ''
binding.showSaveDialog window,
String(options.title),
String(options.defaultPath)
binding.showSaveDialog String(options.title),
String(options.defaultPath),
window,
callback
showMessageBox: (window, options, callback) ->
unless window?.constructor is BrowserWindow