Skip to content

Commit bbbc9db

Browse files
authored
Merge pull request #51 from poiru/electron-update
Update to latest master of electron/electron
2 parents a479eee + 00f44b3 commit bbbc9db

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
}
3030
},
3131
"dependencies": {
32-
"@types/node": "^7.0.5",
32+
"@types/node": "^7.0.18",
3333
"colors": "^1.1.2",
3434
"debug": "^2.6.3",
3535
"electron-docs": "^2.0.0",
36-
"electron-docs-linter": "^2.3.0",
36+
"electron-docs-linter": "^2.3.3",
3737
"lodash": "^4.16.1",
3838
"mkdirp": "^0.5.1",
3939
"rimraf": "^2.5.4",

test-smoke/electron/test/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ app.on("ready", () => {
829829
});
830830

831831
protocol.registerBufferProtocol("atom", (request, callback) => {
832-
callback({ mimeType: "text/html", buffer: new Buffer("<h5>Response</h5>") });
832+
callback({ mimeType: "text/html", data: new Buffer("<h5>Response</h5>") });
833833
});
834834

835835
protocol.registerStringProtocol("atom", (request, callback) => {

vendor/fetch-docs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const mkdirp = require('mkdirp').sync
77
const os = require('os')
88

99
const downloadPath = path.join(os.tmpdir(), 'electron-api-tmp')
10-
const ELECTRON_COMMIT = '6ca7787f13ec06d092aba241588b8151db7266ec'
10+
const ELECTRON_COMMIT = 'a6e11d3b63cb7ca3b3661b6a56a853358b1ab734'
1111

1212
rm(downloadPath)
1313

0 commit comments

Comments
 (0)