github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert event names to small caps

Browse Source 
This patch takes inspiration from DOM events and makes all the
events small-caps.
This commit is contained in:
Andrey Lushnikov 2017-05-13 12:04:30 -07:00
parent cf900cf717
commit 939038bb08
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/features.js
View File

@ -21,7 +21,7 @@ var browser = new Browser();
browser.newPage().then(async page => { browser.newPage().then(async page => {
var modernizrPath = path.join('..', 'third_party', 'phantomjs', 'examples', 'modernizr.js'); var modernizrPath = path.join('..', 'third_party', 'phantomjs', 'examples', 'modernizr.js');
await page.injectFile(modernizrPath); await page.injectFile(modernizrPath);
page.on('ConsoleMessage', console.log); page.on('consolemessage', console.log);
await page.evaluate(detectFeatures); await page.evaluate(detectFeatures);
browser.close(); browser.close();
}); });

2
examples/pagecallback.js
View File

@ -18,7 +18,7 @@ var Browser = require('../lib/Browser');
var browser = new Browser(); var browser = new Browser();
browser.newPage().then(async page => { browser.newPage().then(async page => {
page.on('ConsoleMessage', console.log); page.on('consolemessage', console.log);
await page.setInPageCallback('callPhantom', msg => { await page.setInPageCallback('callPhantom', msg => {
console.log("Received by the 'phantom' main context: "+msg); console.log("Received by the 'phantom' main context: "+msg);
return "Hello there, I'm coming to you from the 'phantom' context instead"; return "Hello there, I'm coming to you from the 'phantom' context instead";

14
lib/Page.js
View File

@ -60,7 +60,7 @@ class Page extends EventEmitter {
client.on('Network.responseReceived', event => this.emit(Page.Events.ResponseReceived, event.response)); client.on('Network.responseReceived', event => this.emit(Page.Events.ResponseReceived, event.response));
client.on('Network.loadingFailed', event => this.emit(Page.Events.ResourceLoadingFailed, event)); client.on('Network.loadingFailed', event => this.emit(Page.Events.ResourceLoadingFailed, event));
client.on('Runtime.consoleAPICalled', event => this._onConsoleAPI(event)); client.on('Runtime.consoleAPICalled', event => this._onConsoleAPI(event));
client.on('Page.javascriptDialogOpening', dialog => this.emit(Page.Events.DialogOpened, dialog)); client.on('Page.javascriptDialogOpening', dialog => this.emit(Page.Events.Dialog, dialog));
client.on('Runtime.exceptionThrown', exception => this._handleException(exception.exceptionDetails)); client.on('Runtime.exceptionThrown', exception => this._handleException(exception.exceptionDetails));
} }
@ -199,7 +199,7 @@ class Page extends EventEmitter {
stack = exceptionDetails.stackTrace.callFrames.map(cf => cf.url); stack = exceptionDetails.stackTrace.callFrames.map(cf => cf.url);
} }
var stackTrace = exceptionDetails.stackTrace; var stackTrace = exceptionDetails.stackTrace;
this.emit(Page.Events.ExceptionThrown, exceptionDetails.exception.description, stack); this.emit(Page.Events.Exception, exceptionDetails.exception.description, stack);
} }
_onConsoleAPI(event) { _onConsoleAPI(event) {
@ -416,11 +416,11 @@ Page.ScreenshotTypes = {
}; };
Page.Events = { Page.Events = {
ConsoleMessage: 'ConsoleMessage', ConsoleMessage: 'consolemessage',
DialogOpened: 'DialogOpened', Dialog: 'dialog',
ExceptionThrown: 'ExceptionThrown', Exception: 'exception',
ResourceLoadingFailed: 'ResourceLoadingFailed', ResourceLoadingFailed: 'resourceloadingfailed',
ResponseReceived: 'ResponseReceived', ResponseReceived: 'responsereceived',
}; };
module.exports = Page; module.exports = Page;

4
phantomjs/WebPage.js
View File

@ -64,8 +64,8 @@ class WebPage {
this._pageEvents.on(PageEvents.ResponseReceived, response => this._onResponseReceived(response)); this._pageEvents.on(PageEvents.ResponseReceived, response => this._onResponseReceived(response));
this._pageEvents.on(PageEvents.ResourceLoadingFailed, event => (this.onResourceError || noop).call(null, event)); this._pageEvents.on(PageEvents.ResourceLoadingFailed, event => (this.onResourceError || noop).call(null, event));
this._pageEvents.on(PageEvents.ConsoleMessage, msg => (this.onConsoleMessage || noop).call(null, msg)); this._pageEvents.on(PageEvents.ConsoleMessage, msg => (this.onConsoleMessage || noop).call(null, msg));
this._pageEvents.on(PageEvents.DialogOpened, dialog => this._onDialog(dialog)); this._pageEvents.on(PageEvents.Dialog, dialog => this._onDialog(dialog));
this._pageEvents.on(PageEvents.ExceptionThrown, (exception, stack) => (this._onError || noop).call(null, exception, stack)); this._pageEvents.on(PageEvents.Exception, (exception, stack) => (this._onError || noop).call(null, exception, stack));
} }
_onResponseReceived(response) { _onResponseReceived(response) {

2
test/test.js
View File

@ -35,7 +35,7 @@ describe('Puppeteer', function() {
it('Page Events: ConsoleMessage', SX(async function() { it('Page Events: ConsoleMessage', SX(async function() {
var msgs = []; var msgs = [];
page.on('ConsoleMessage', msg => msgs.push(msg)); page.on('consolemessage', msg => msgs.push(msg));
await page.evaluate(() => console.log('Message!')); await page.evaluate(() => console.log('Message!'));
expect(msgs).toEqual(['Message!']); expect(msgs).toEqual(['Message!']);
})); }));