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

Enable passing null to dialog API.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-24 13:10:04 +08:00
parent 83debe2e43
commit d3cda97d50
2 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
atom/browser/api/atom_api_dialog.cc
View file

@ -23,23 +23,18 @@ void ShowMessageBox(int type,
const std::string& title, const std::string& title,
const std::string& message, const std::string& message,
const std::string& detail, const std::string& detail,
atom::api::Window* window, atom::NativeWindow* window,
mate::Arguments* args) { mate::Arguments* args) {
v8::Handle<v8::Value> peek = args->PeekNext(); v8::Handle<v8::Value> peek = args->PeekNext();
atom::MessageBoxCallback callback; atom::MessageBoxCallback callback;
if (mate::Converter<atom::MessageBoxCallback>::FromV8(node_isolate, if (mate::Converter<atom::MessageBoxCallback>::FromV8(node_isolate,
peek, peek,
&callback)) { &callback)) {
atom::ShowMessageBox(window->window(), (atom::MessageBoxType)type, buttons, atom::ShowMessageBox(window, (atom::MessageBoxType)type, buttons, title,
title, message, detail, callback); message, detail, callback);
} else { } else {
int chosen = atom::ShowMessageBox( int chosen = atom::ShowMessageBox(window, (atom::MessageBoxType)type,
window->window(), buttons, title, message, detail);
(atom::MessageBoxType)type,
buttons,
title,
message,
detail);
args->Return(chosen); args->Return(chosen);
} }
} }
@ -47,21 +42,18 @@ void ShowMessageBox(int type,
void ShowOpenDialog(const std::string& title, void ShowOpenDialog(const std::string& title,
const base::FilePath& default_path, const base::FilePath& default_path,
int properties, int properties,
atom::api::Window* window, atom::NativeWindow* window,
mate::Arguments* args) { mate::Arguments* args) {
v8::Handle<v8::Value> peek = args->PeekNext(); v8::Handle<v8::Value> peek = args->PeekNext();
file_dialog::OpenDialogCallback callback; file_dialog::OpenDialogCallback callback;
if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(node_isolate, if (mate::Converter<file_dialog::OpenDialogCallback>::FromV8(node_isolate,
peek, peek,
&callback)) { &callback)) {
file_dialog::ShowOpenDialog(window->window(), title, default_path, file_dialog::ShowOpenDialog(window, title, default_path, properties,
properties, callback); callback);
} else { } else {
std::vector<base::FilePath> paths; std::vector<base::FilePath> paths;
if (file_dialog::ShowOpenDialog(window->window(), if (file_dialog::ShowOpenDialog(window, title, default_path, properties,
title,
default_path,
properties,
&paths)) &paths))
args->Return(paths); args->Return(paths);
} }
@ -69,19 +61,17 @@ void ShowOpenDialog(const std::string& title,
void ShowSaveDialog(const std::string& title, void ShowSaveDialog(const std::string& title,
const base::FilePath& default_path, const base::FilePath& default_path,
atom::api::Window* window, atom::NativeWindow* window,
mate::Arguments* args) { mate::Arguments* args) {
v8::Handle<v8::Value> peek = args->PeekNext(); v8::Handle<v8::Value> peek = args->PeekNext();
file_dialog::SaveDialogCallback callback; file_dialog::SaveDialogCallback callback;
if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(node_isolate, if (mate::Converter<file_dialog::SaveDialogCallback>::FromV8(node_isolate,
peek, peek,
&callback)) { &callback)) {
file_dialog::ShowSaveDialog(window->window(), title, default_path, file_dialog::ShowSaveDialog(window, title, default_path, callback);
callback);
} else { } else {
base::FilePath path; base::FilePath path;
if (file_dialog::ShowSaveDialog(window->window(), title, default_path, if (file_dialog::ShowSaveDialog(window, title, default_path, &path))
&path))
args->Return(path); args->Return(path);
} }
} }

23
atom/browser/api/atom_api_window.h
View file

@ -134,4 +134,27 @@ class Window : public mate::EventEmitter,
} // namespace atom } // namespace atom
namespace mate {
template<>
struct Converter<atom::NativeWindow*> {
static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
atom::NativeWindow** out) {
// null would be tranfered to NULL.
if (val->IsNull()) {
*out = NULL;
return true;
}
atom::api::Window* window;
if (!Converter<atom::api::Window*>::FromV8(isolate, val, &window))
return false;
*out = window->window();
return true;
}
};
} // namespace mate
#endif // ATOM_BROWSER_API_ATOM_API_WINDOW_H_ #endif // ATOM_BROWSER_API_ATOM_API_WINDOW_H_