Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 amp-geo: Target AMP body with class changes (#20946) #21282

Merged
merged 2 commits into from Mar 6, 2019
Merged

🐛 amp-geo: Target AMP body with class changes (#20946) #21282

merged 2 commits into from Mar 6, 2019

Conversation

mattwomple
Copy link
Member

Use getAmpDoc method to obtain document and body, fixing compatibility
with PWAs, where the body is not simply window.document.body.

Fixes #20946

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@mattwomple
Copy link
Member Author

CLA signed

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

mattwomple and others added 2 commits March 5, 2019 23:48
Use getAmpDoc method to obtain document and body, fixing compatibility
with PWAs, where the body is not simply window.document.body.

Fixes #20946
Copy link
Contributor

@jpettitt jpettitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jridgewell
Copy link
Contributor

/cc @choumx Does this fit with out plans for AmpDoc?

@mattwomple
Copy link
Member Author

Please do not merge. Issue found: const geoState = doc.getElementById(GEO_ID); will not identify the correct element.

@jpettitt jpettitt merged commit 8521bc0 into ampproject:master Mar 6, 2019
@zhouyx
Copy link
Contributor

zhouyx commented Mar 6, 2019

@matthewlane Thank you for contributing and submitting the fix! Let's aiming at get #21293 in before the canary cut as well. Thank you

zhouyx pushed a commit that referenced this pull request Mar 6, 2019
* amp-geo: Fix inconsistent geoState parent

PR #21282 introduced a new issue where the #ampGeo <amp-state> would be
appended to the ampdoc body but searched for in the win.doc body. Look
for #ampGeo in ampdoc.

* amp-geo: Apply clearPreRender to AMP body

PR #21282 changed the location of amp-geo related classes to the AMP
document body. Propagate the change to the clearPreRender_method as
well.

* amp-geo: Consistently use ampdoc in addToBody_

It is not necessary to retain both doc and ampdoc in the addToBody_
method. Update to use only ampdoc.
@mattwomple mattwomple deleted the mattwomple-patch-1 branch March 7, 2019 01:26
@dreamofabear
Copy link

Looks fine to me.

noranazmy pushed a commit to noranazmy/amphtml that referenced this pull request Mar 22, 2019
…project#21282)

* 🐛 amp-geo: Target AMP body with class changes (ampproject#20946)

Use getAmpDoc method to obtain document and body, fixing compatibility
with PWAs, where the body is not simply window.document.body.

Fixes ampproject#20946

* typo in comment
noranazmy pushed a commit to noranazmy/amphtml that referenced this pull request Mar 22, 2019
* amp-geo: Fix inconsistent geoState parent

PR ampproject#21282 introduced a new issue where the #ampGeo <amp-state> would be
appended to the ampdoc body but searched for in the win.doc body. Look
for #ampGeo in ampdoc.

* amp-geo: Apply clearPreRender to AMP body

PR ampproject#21282 changed the location of amp-geo related classes to the AMP
document body. Propagate the change to the clearPreRender_method as
well.

* amp-geo: Consistently use ampdoc in addToBody_

It is not necessary to retain both doc and ampdoc in the addToBody_
method. Update to use only ampdoc.
bramanudom pushed a commit to bramanudom/amphtml that referenced this pull request Mar 22, 2019
…project#21282)

* 🐛 amp-geo: Target AMP body with class changes (ampproject#20946)

Use getAmpDoc method to obtain document and body, fixing compatibility
with PWAs, where the body is not simply window.document.body.

Fixes ampproject#20946

* typo in comment
bramanudom pushed a commit to bramanudom/amphtml that referenced this pull request Mar 22, 2019
* amp-geo: Fix inconsistent geoState parent

PR ampproject#21282 introduced a new issue where the #ampGeo <amp-state> would be
appended to the ampdoc body but searched for in the win.doc body. Look
for #ampGeo in ampdoc.

* amp-geo: Apply clearPreRender to AMP body

PR ampproject#21282 changed the location of amp-geo related classes to the AMP
document body. Propagate the change to the clearPreRender_method as
well.

* amp-geo: Consistently use ampdoc in addToBody_

It is not necessary to retain both doc and ampdoc in the addToBody_
method. Update to use only ampdoc.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

amp-geo appends classes to wrong <body> in PWA
6 participants