Skip to content

Commit

Permalink
Merge pull request #658 from rosshinkley/350-js-event-handler
Browse files Browse the repository at this point in the history
patching javascript action to remove extra listeners
  • Loading branch information
rosshinkley committed May 27, 2016
2 parents 43233ac + b2b2c3e commit bdb7464
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions lib/runner.js
Expand Up @@ -295,21 +295,27 @@ app.on('ready', function() {
});

/**
* javascript
* javascript
*/

parent.respondTo('javascript', function(src, done) {
renderer.once('response', function(event, response) {
var response = (event, response) => {
renderer.removeListener('error', error);
renderer.removeListener('log', log);
done(null, response);
});
};

renderer.once('error', function(event, error) {
var error = (event, error) => {
renderer.removeListener('log', log);
renderer.removeListener('response', response);
done(error);
});
};

renderer.once('log', function(event, args) {
parent.emit.apply(parent, ['log'].concat(args));
});
var log = (event, args) => parent.emit.apply(parent, ['log'].concat(args));

renderer.once('response', response);
renderer.once('error', error);
renderer.on('log', log);

win.webContents.executeJavaScript(src);
});
Expand Down

0 comments on commit bdb7464

Please sign in to comment.