Merge pull request #4496 from cesine/update/deps

fix dependencies badge  which shows out of date
This commit is contained in:
Cheng Zhao 2016-02-16 22:18:51 +08:00
commit 61a9316f67
16 changed files with 28 additions and 27 deletions

View file

@ -130,7 +130,7 @@ var unwrapArgs = function(sender, args) {
return Promise.resolve({
then: metaToValue(meta.then)
});
case 'object':
case 'object': {
let ret = v8Util.createObjectWithName(meta.name);
ref = meta.members;
for (i = 0, len = ref.length; i < len; i++) {
@ -138,12 +138,13 @@ var unwrapArgs = function(sender, args) {
ret[member.name] = metaToValue(member.value);
}
return ret;
}
case 'function-with-return-value':
returnValue = metaToValue(meta.value);
return function() {
return returnValue;
};
case 'function':
case 'function': {
// Cache the callbacks in renderer.
if (!sender.callbacks) {
sender.callbacks = new IDWeakMap;
@ -172,6 +173,7 @@ var unwrapArgs = function(sender, args) {
});
sender.callbacks.set(meta.id, callIntoRenderer);
return callIntoRenderer;
}
default:
throw new TypeError("Unknown type: " + meta.type);
}

View file

@ -3,7 +3,7 @@
"version": "0.36.7",
"devDependencies": {
"asar": "^0.9.0",
"eslint": "^1.10.3",
"eslint": "^2.1.0",
"request": "*"
},
"optionalDependencies": {

View file

@ -517,7 +517,6 @@ describe('asar package', function() {
});
});
describe('child_process.fork', function() {
child_process = require('child_process');
it('opens a normal js file', function(done) {
var child;
child = child_process.fork(path.join(fixtures, 'asar', 'a.asar', 'ping.js'));

View file

@ -1,12 +1,12 @@
var app = require('electron').app
var app = require('electron').app;
app.on('ready', function () {
// This setImmediate call gets the spec passing on Linux
setImmediate(function () {
app.exit(123)
})
})
app.exit(123);
});
});
process.on('exit', function (code) {
console.log('Exit event with code: ' + code)
})
console.log('Exit event with code: ' + code);
});

View file

@ -1,7 +1,7 @@
exports.call = function(func) {
return func();
}
};
exports.constructor = function() {
this.test = 'test';
}
};

View file

@ -1 +1 @@
exports.id = 1127
exports.id = 1127;

View file

@ -1,4 +1,4 @@
process.on('message', function (msg) {
process.on('message', function () {
process.send([
'a'.localeCompare('a'),
'ä'.localeCompare('z', 'de'),

View file

@ -1,3 +1,3 @@
process.on('message', function (msg) {
process.on('message', function () {
process.send(typeof require('original-fs'));
});

View file

@ -1,7 +1,7 @@
exports.print = function(obj) {
return obj.constructor.name;
}
};
exports.echo = function(obj) {
return obj;
}
};

View file

@ -2,4 +2,4 @@ exports.twicePromise = function (promise) {
return promise.then(function (value) {
return value * 2;
});
}
};

View file

@ -1 +1 @@
exports.property = 1127
exports.property = 1127;

View file

@ -1,4 +1,4 @@
var ipcRenderer = require('electron').ipcRenderer;
window.onload = function() {
ipcRenderer.send('answer', typeof window.process);
}
};

View file

@ -3,7 +3,7 @@ process.on('uncaughtException', function(error) {
process.exit(1);
});
process.on('message', function(msg) {
process.on('message', function() {
setImmediate(function() {
process.send('ok');
process.exit(0);

View file

@ -1,7 +1,7 @@
onconnect = function(event) {
this.onconnect = function(event) {
var port = event.ports[0];
port.start();
port.onmessage = function(event) {
port.postMessage(event.data);
}
}
};
};

View file

@ -1,3 +1,3 @@
this.onmessage = function(msg) {
this.postMessage(msg.data);
}
};

View file

@ -74,7 +74,7 @@ app.on('ready', function() {
// Send auto updater errors to window to be verified in specs
electron.autoUpdater.on('error', function (error) {
window.send('auto-updater-error', error.message)
window.send('auto-updater-error', error.message);
});
window = new BrowserWindow({
@ -108,7 +108,7 @@ app.on('ready', function() {
// reply the result to renderer for verifying
var downloadFilePath = path.join(__dirname, '..', 'fixtures', 'mock.pdf');
ipcMain.on('set-download-option', function(event, need_cancel, prevent_default) {
window.webContents.session.once('will-download', function(e, item, webContents) {
window.webContents.session.once('will-download', function(e, item) {
if (prevent_default) {
e.preventDefault();
const url = item.getURL();