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

Defer evaluation onInitalized

Browse Source
This commit is contained in:
Joel Einbinder 2017-05-12 16:25:04 -07:00 committed by Andrey Lushnikov
parent e8af69e5bb
commit 2b0d0e6551
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phantomjs/WebPage.js
View File

@ -52,6 +52,9 @@ class WebPage {
this.onLoadFinished = null; this.onLoadFinished = null;
this.onResourceError = null; this.onResourceError = null;
this.onResourceReceived = null; this.onResourceReceived = null;
this.onInitialized = null;
this._deferEvaluate = false;
this.libraryPath = path.dirname(scriptPath); this.libraryPath = path.dirname(scriptPath);
this._onConfirm = undefined; this._onConfirm = undefined;
@ -192,6 +195,10 @@ class WebPage {
*/ */
open(url, callback) { open(url, callback) {
console.assert(arguments.length <= 2, 'WebPage.open does not support METHOD and DATA arguments'); console.assert(arguments.length <= 2, 'WebPage.open does not support METHOD and DATA arguments');
this._deferEvaluate = true;
if (typeof this.onInitialized === 'function')
this.onInitialized();
this._deferEvaluate = false;
this._page.navigate(url).then(result => { this._page.navigate(url).then(result => {
var status = result ? 'success' : 'fail'; var status = result ? 'success' : 'fail';
if (!result) { if (!result) {
@ -219,6 +226,8 @@ class WebPage {
* @param {!Array<!Object>} args * @param {!Array<!Object>} args
*/ */
evaluate(fun, ...args) { evaluate(fun, ...args) {
if (this._deferEvaluate)
return await(this._page.evaluateOnInitialized(fun, ...args));
return await(this._page.evaluate(fun, ...args)); return await(this._page.evaluate(fun, ...args));
} }