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

Revert "Revert "Merge pull request #1909 from BrightcoveOS/amp-brightcove-params"" #1946

Merged
merged 2 commits into from
Feb 16, 2016

Conversation

erwinmombay
Copy link
Member

This reverts commit e5ab3f5.

@erwinmombay erwinmombay force-pushed the test-flakey branch 4 times, most recently from 9853429 to 0efb95d Compare February 12, 2016 02:18
@mstoltenburg
Copy link

Is this an experiment? I thought the data-player attribute finally changed to data-player-id. Though the normal (not AMP) brightcove player embed code uses data-player. And there is still one occurrence/check for data-player inside validator.protoascii in master.

@erwinmombay
Copy link
Member Author

@mstoltenburg really sorry, we had to roll this back as it was causing our builds to fail. will try and get this back in as soon as possible. possibly just skipping the test for now until we figure it out.

@erwinmombay
Copy link
Member Author

@cramforce only change i did was the 2nd commit skipping the last test.

@erwinmombay erwinmombay changed the title [DO NOT SUBMIT][TESTING] Revert "Revert "Merge pull request #1909 from BrightcoveOS/amp-bright… Revert "Revert "Merge pull request #1909 from BrightcoveOS/amp-brightcove-params"" Feb 13, 2016
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@erwinmombay
Copy link
Member Author

@mister-ben can you please respond to the google bot with "I confirm", i cherry picked your commit again to give you proper attribution (so that it is your commit). i had to skip the last test to make travis green.

@mister-ben
Copy link
Contributor

@googlebot i confirm

@mister-ben
Copy link
Contributor

@mstoltenburg I'm very sorry about the changing from data-player-id to data-player. It really should have been data-player all along to match the non-AMP embed, as you note, which caused some understandable confusion. With this change either can be used to ensure existing pages continue to work, with data-player being preferred in documentation.

@cramforce
Copy link
Member

LGTM

@jridgewell
Copy link
Contributor

Ping @erwinmombay: Are we merging this back in?

mister-ben and others added 2 commits February 16, 2016 08:39
Allow `data-player` as intented as well as `data-playerid`
Use `data-player` in docs
Document `data-param-*`
@erwinmombay
Copy link
Member Author

@jridgewell yep, just waiting on green build again

erwinmombay added a commit that referenced this pull request Feb 16, 2016
Revert "Revert "Merge pull request #1909 from BrightcoveOS/amp-brightcove-params""
@erwinmombay erwinmombay merged commit 325878c into ampproject:master Feb 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants