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.

Sign up for GitHub

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

Jump to bottom

Fix layouts and host for GMOSSP amp-ads #10566

Merged
merged 6 commits into from Aug 18, 2017
Merged

Fix layouts and host for GMOSSP amp-ads #10566

merged 6 commits into from Aug 18, 2017

Conversation

t-kino
Copy link
Contributor

@t-kino t-kino commented Jul 21, 2017

Could you merge 'Fix layouts and host for GMOSSP amp-ads' into ampproject/amphtml master branch?

We have a Google Corporate CLA.
Our CLA: GMO AD Marketing Inc.
Our company name: GMO AD Marketing Inc.

Thank you in advance

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. 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, please reply here (e.g. I signed it!) and we'll verify. Thanks.

  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If your company signed a CLA, they designated a Point of Contact who decides which employees are authorized to participate. You may need to contact the Point of Contact for your company and ask to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the project maintainer to go/cla#troubleshoot.
  • 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.

@t-kino
Copy link
Contributor Author

t-kino commented Jul 21, 2017

I signed it!

@googlebot
Copy link

CLAs look good, thanks!

@t-kino
Copy link
Contributor Author

t-kino commented Aug 1, 2017

Could @keithwrightbos review my pull request?

@t-kino
Copy link
Contributor Author

t-kino commented Aug 3, 2017

Hi @jridgewell, @keithwrightbos,

Could you review my pull request?
Just two business days have passed already.

Please make sure everything is done smoothly.
Could you tell me if I made any mistakes about procedures?

Best regards,

keithwrightbos
keithwrightbos requested changes Aug 3, 2017
View reviewed changes
extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js Outdated
const GMOSSP_BASE_URL_ = 'https://sp.gmossp-sp.jp';
const GMOSSP_BASE_URL_ = 'https://sp.gmossp-sp.jp/';

const GMOSSP_BASE_A4A_URL_ = 'https://amp.sp.gmossp-sp.jp/_a4a/';
Copy link
Contributor

Choose a reason for hiding this comment

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

typedoc?

extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js
@@ -49,7 +51,8 @@ export class AmpAdNetworkGmosspImpl extends AmpA4A {

/** @override */
getAdUrl() {
return this.element.getAttribute('src');
return this.element.getAttribute('src').replace(GMOSSP_BASE_URL_,
GMOSSP_BASE_A4A_URL_);
Copy link
Contributor

Choose a reason for hiding this comment

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

I noticed that isValidElement expects the old url format. Do you want to update to also allow a4a path?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I do.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then you need to modify isValidElement to allow either GMOSSP_BASE_A4A_URL_ or GMOSSP_BASE_URL_. You will also need to modify extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config#gmosspIsA4AEnabled

@t-kino
Copy link
Contributor Author

t-kino commented Aug 4, 2017

@keithwrightbos
Thank you for your review. Could you check this again?

keithwrightbos
keithwrightbos requested changes Aug 4, 2017
View reviewed changes
extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js
@@ -49,7 +51,8 @@ export class AmpAdNetworkGmosspImpl extends AmpA4A {

/** @override */
getAdUrl() {
return this.element.getAttribute('src');
return this.element.getAttribute('src').replace(GMOSSP_BASE_URL_,
GMOSSP_BASE_A4A_URL_);
Copy link
Contributor

Choose a reason for hiding this comment

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

Then you need to modify isValidElement to allow either GMOSSP_BASE_A4A_URL_ or GMOSSP_BASE_URL_. You will also need to modify extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config#gmosspIsA4AEnabled

@t-kino
Copy link
Contributor Author

t-kino commented Aug 7, 2017

@keithwrightbos
Thanks for your advice. I modified as above.
Is this alright with you?

@matsumoto-kouichi
Copy link

Hi @jridgewell, @keithwrightbos,
I'm @matsumoto-kouichi and I'm a boss of @t-kino.
I would be grateful if you could please check this.

keithwrightbos
keithwrightbos approved these changes Aug 18, 2017
View reviewed changes
Copy link
Contributor

@keithwrightbos keithwrightbos left a comment

Choose a reason for hiding this comment

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

Apologies for the delay

@keithwrightbos keithwrightbos merged commit 809ab86 into ampproject:master Aug 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@keithwrightbos keithwrightbos keithwrightbos approved these changes

Assignees
No one assigned
Labels
cla: yes WG: monetization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@t-kino @googlebot @matsumoto-kouichi @keithwrightbos @jridgewell