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-custom-ads: require CORS #7331

Merged
merged 9 commits into from Feb 10, 2017
Merged

amp-custom-ads: require CORS #7331

merged 9 commits into from Feb 10, 2017

Conversation

xgretsch
Copy link
Contributor

@xgretsch xgretsch commented Feb 3, 2017

Change the flag to require CORS to true, and update the ad documentation

Closes #6758

Added description of how to use analytics, removed incorrect complaint
that responsive images were erratic.
When an ad was not present, an attempt was still being made to find and
render the template, which was causing errors. Documentation now has an
example on how to use amp-analytics, and removed the wrong line about
problems with image layout.
Removed unnecessary line of code, as well as id from amp-analytics
example
Change the flag to require CORS to true, and update the ad documentation
@jridgewell jridgewell changed the title Customad1 amp-custom-ads: require CORS Feb 3, 2017
@jridgewell
Copy link
Contributor

/to @lannka (this is an XS one 😉)

@@ -85,7 +85,7 @@ export class AmpAdCustom extends AMP.BaseElement {
if (!(fullUrl in ampCustomadXhrPromises)) {
// Here is a promise that will return the data for this URL
ampCustomadXhrPromises[fullUrl] = xhrFor(this.win).fetchJson(fullUrl, {
requireAmpResponseSourceOrigin: false,
requireAmpResponseSourceOrigin: true,
Copy link
Contributor

Choose a reason for hiding this comment

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

you can remove. true is the default.

@lannka lannka merged commit e63da1b into ampproject:master Feb 10, 2017
torch2424 pushed a commit to torch2424/amphtml that referenced this pull request Feb 14, 2017
* Updated custom ad documentation

Added description of how to use analytics, removed incorrect complaint
that responsive images were erratic.

* Fixed error when no ad present, documentation update

When an ad was not present, an attempt was still being made to find and
render the template, which was causing errors. Documentation now has an
example on how to use amp-analytics, and removed the wrong line about
problems with image layout.

* Removed redundant line of code

Removed unnecessary line of code, as well as id from amp-analytics
example

* Issue ampproject#6758 - Require ampCors in custom ad

Change the flag to require CORS to true, and update the ad documentation

* Removed unnecessary parameter to fetchJson
mrjoro pushed a commit to mrjoro/amphtml that referenced this pull request Apr 28, 2017
* Updated custom ad documentation

Added description of how to use analytics, removed incorrect complaint
that responsive images were erratic.

* Fixed error when no ad present, documentation update

When an ad was not present, an attempt was still being made to find and
render the template, which was causing errors. Documentation now has an
example on how to use amp-analytics, and removed the wrong line about
problems with image layout.

* Removed redundant line of code

Removed unnecessary line of code, as well as id from amp-analytics
example

* Issue ampproject#6758 - Require ampCors in custom ad

Change the flag to require CORS to true, and update the ad documentation

* Removed unnecessary parameter to fetchJson
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants