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

Merge branch 'master' of https://github.com/electron/electron

Browse source
This commit is contained in:
Cheng Zhao 2016-05-11 15:15:15 +09:00
commit 2cd41b2f84
11 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/api/app.md
View file

@ -563,6 +563,12 @@ Returns an ID representing the request.
Cancel the bounce of `id`.
### `app.dock.downloadFinished(filePath)` _OS X_
* `filePath` String
Bounces the Downloads stack if the filePath is inside the Downloads folder.
### `app.dock.setBadge(text)` _OS X_
* `text` String

4
docs/api/session.md
View file

@ -89,13 +89,13 @@ session.defaultSession.cookies.get({}, (error, cookies) => {
});
// Query all cookies associated with a specific url.
session.defaultSession.cookies.get({url : 'http://www.github.com'}, (error, cookies) => {
session.defaultSession.cookies.get({url: 'http://www.github.com'}, (error, cookies) => {
console.log(cookies);
});
// Set a cookie with the given cookie data;
// may overwrite equivalent cookies if they exist.
const cookie = {url : 'http://www.github.com', name : 'dummy_name', value : 'dummy'};
const cookie = {url: 'http://www.github.com', name: 'dummy_name', value: 'dummy'};
session.defaultSession.cookies.set(cookie, (error) => {
if (error)
console.error(error);