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

Use FromV8Arguments in atom_api_dialog.cc.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-23 22:52:48 +08:00
parent 1e5e0194bd
commit 8fdd3b3044
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
browser/api/atom_api_dialog.cc
View file

@ -52,18 +52,12 @@ void Initialize(v8::Handle<v8::Object> target) {
v8::Handle<v8::Value> ShowMessageBox(const v8::Arguments &args) { v8::Handle<v8::Value> ShowMessageBox(const v8::Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
if (!args[0]->IsNumber() || // type int type;
!args[1]->IsArray() || // buttons std::vector<std::string> buttons;
!args[2]->IsString() || // title std::string title, message, detail;
!args[3]->IsString() || // message if (!FromV8Arguments(args, &type, &buttons, &title, &message, &detail))
!args[4]->IsString()) // detail
return node::ThrowTypeError("Bad argument"); return node::ThrowTypeError("Bad argument");
int type = FromV8Value(args[0]);
std::vector<std::string> buttons = FromV8Value(args[1]);
std::string title = FromV8Value(args[2]);
std::string message = FromV8Value(args[3]);
std::string detail = FromV8Value(args[4]);
NativeWindow* native_window = FromV8Value(args[5]); NativeWindow* native_window = FromV8Value(args[5]);
v8::Persistent<v8::Function> callback = FromV8Value(args[6]); v8::Persistent<v8::Function> callback = FromV8Value(args[6]);
@ -92,14 +86,12 @@ v8::Handle<v8::Value> ShowMessageBox(const v8::Arguments &args) {
v8::Handle<v8::Value> ShowOpenDialog(const v8::Arguments &args) { v8::Handle<v8::Value> ShowOpenDialog(const v8::Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
if (!args[0]->IsString() || // title std::string title;
!args[1]->IsString() || // default_path base::FilePath default_path;
!args[2]->IsNumber()) // properties int properties;
if (!FromV8Arguments(args, &title, &default_path, &properties))
return node::ThrowTypeError("Bad argument"); return node::ThrowTypeError("Bad argument");
std::string title = FromV8Value(args[0]);
base::FilePath default_path = FromV8Value(args[1]);
int properties = FromV8Value(args[2]);
NativeWindow* native_window = FromV8Value(args[3]); NativeWindow* native_window = FromV8Value(args[3]);
v8::Persistent<v8::Function> callback = FromV8Value(args[4]); v8::Persistent<v8::Function> callback = FromV8Value(args[4]);
@ -132,12 +124,11 @@ v8::Handle<v8::Value> ShowOpenDialog(const v8::Arguments &args) {
v8::Handle<v8::Value> ShowSaveDialog(const v8::Arguments &args) { v8::Handle<v8::Value> ShowSaveDialog(const v8::Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
if (!args[0]->IsString() || // title std::string title;
!args[1]->IsString()) // default_path base::FilePath default_path;
if (!FromV8Arguments(args, &title, &default_path))
return node::ThrowTypeError("Bad argument"); return node::ThrowTypeError("Bad argument");
std::string title = FromV8Value(args[0]);
base::FilePath default_path = FromV8Value(args[1]);
NativeWindow* native_window = FromV8Value(args[2]); NativeWindow* native_window = FromV8Value(args[2]);
v8::Persistent<v8::Function> callback = FromV8Value(args[3]); v8::Persistent<v8::Function> callback = FromV8Value(args[3]);