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

without_activation -> activate

Browse source
This commit is contained in:
Kevin Sawicki 2016-02-16 15:55:37 -08:00
parent 52db43eee5
commit f5bed87199
6 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/common/api/atom_api_shell.cc
View file

@ -12,22 +12,12 @@
namespace {
bool OpenExternal(const GURL& url, mate::Arguments* args) {
bool without_activation = false;
if (args->Length() == 2) {
mate::Dictionary options;
args->GetNext(&options);
options.Get("withoutActivation", &without_activation);
}
return platform_util::OpenExternal(url, without_activation);
}
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
v8::Local<v8::Context> context, void* priv) {
mate::Dictionary dict(context->GetIsolate(), exports);
dict.SetMethod("showItemInFolder", &platform_util::ShowItemInFolder);
dict.SetMethod("openItem", &platform_util::OpenItem);
dict.SetMethod("openExternal", &OpenExternal);
dict.SetMethod("_openExternal", &platform_util::OpenExternal);
dict.SetMethod("moveItemToTrash", &platform_util::MoveItemToTrash);
dict.SetMethod("beep", &platform_util::Beep);
}

18
atom/common/api/lib/shell.js
View file

@ -1 +1,17 @@
module.exports = process.atomBinding('shell');
'use strict';
const bindings = process.atomBinding('shell');
exports.beep = bindings.beep;
exports.moveItemToTrash = bindings.moveItemToTrash;
exports.openItem = bindings.openItem;
exports.showItemInFolder = bindings.showItemInFolder;
exports.openExternal = (url, options) => {
var activate = true;
if (options != null && options.activate != null) {
activate = !!options.activate;
}
bindings._openExternal(url, activate);
}