Add getHtml support in AmpContext API. #12423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alanorozco
requested changes
Dec 14, 2017
test/integration/test-amp-ad-3p.js
Outdated
| @@ -147,6 +163,18 @@ function createIframeWithApis(fixture) { | |||
| return poll('wait for new IO entry', () => { | |||
| return lastIO != null; | |||
| }); | |||
| }).then(() => { | |||
| let resolver; | |||
There was a problem hiding this comment.
This can be simplified a lot:
// ...
}).then(() => new Promise((resolve, reject) => {
iframe.contentWindow.context.getHtml('a', ['href'], content => {
if (content == '<a href="http://test.com/test">Test link</a>') {
resolve();
} else {
reject(new Error('Invalid getHtml result: ' + content));
}
});
}));I also made changes for a couple of nits here:
- No need for strict equality when comparing against a non-empty string.
- message should say "invalid" rather than "incorrect".
alanorozco
requested changes
Dec 14, 2017
test/integration/test-amp-ad-3p.js
Outdated
| @@ -147,6 +163,16 @@ function createIframeWithApis(fixture) { | |||
| return poll('wait for new IO entry', () => { | |||
| return lastIO != null; | |||
| }); | |||
| }).then(() => { | |||
There was a problem hiding this comment.
how about inlining the return as part of the fat arrow function? :)
.then(() => new Promise(resolve, reject) => {
// ...
}));Nit: Invalid getHtml result would be a better message.
3p/ampcontext.js
Outdated
| @@ -177,6 +180,31 @@ export class AbstractAmpContext { | |||
| return unlisten; | |||
| }; | |||
|
|
|||
| /** | |||
| * Send message to runtime requesting HTML snippet of the parent window. | |||
There was a problem hiding this comment.
Sorry, missed this before.
A few doc nits:
- Description leaks implementation details. How about
Requests HTML snippet from the parent window.? {!Array<string>}- How about replacing
an array of tag attributes to be left in the stringified HTMLwithWhitelist of attributes to be kept in the returned HTML string. Callback to be invoked with the HTML string as the first parameter.
There was a problem hiding this comment.
Done. How about now?
alanorozco
approved these changes
Dec 14, 2017
gzgogo
pushed a commit
to gzgogo/amphtml
that referenced
this pull request
Jan 26, 2018
* Add getHtml support in AmpContext API. * lint * revert fakead3p examples * revert fakead3p examples * revert fakead3p examples * More linter * Address comments * Address comments * Address comments * Address comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12333