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

🚮 [Story bookend] Remove bookend extended code #34343

Merged
merged 26 commits into from
May 17, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c5d32ce
Started removing bookend
mszylkowski May 11, 2021
7256671
Finished removing bookend from files
mszylkowski May 12, 2021
b663d6c
Fixed linting
mszylkowski May 12, 2021
a82c2e6
Updated validation tests
mszylkowski May 12, 2021
a082337
Updated validation tests 2
mszylkowski May 12, 2021
eab9491
Removed bookend strings
mszylkowski May 12, 2021
48d043f
Disabled bookend and related tests
mszylkowski May 12, 2021
cb8e857
Removed checks to bookend
mszylkowski May 13, 2021
6d261ce
Linted
mszylkowski May 13, 2021
39b6c7f
Made bookend an alias of social-share
mszylkowski May 13, 2021
8beae56
Removed bookend test since it's not showing
mszylkowski May 13, 2021
ecf87d5
Removed bookend tests
mszylkowski May 13, 2021
d0d3033
Fixed linting
mszylkowski May 13, 2021
38a400d
Cleanup
mszylkowski May 13, 2021
0a5f10e
Fixed linting again
mszylkowski May 13, 2021
1fd462d
Removed visual tests
mszylkowski May 13, 2021
e9b89f1
Fixed test
mszylkowski May 14, 2021
fdefa69
Merge branch 'main' of github.com:ampproject/amphtml into bookend_dis…
mszylkowski May 17, 2021
0809e4e
Merge branch 'main' of github.com:ampproject/amphtml into remove_bookend
mszylkowski May 17, 2021
43d2c58
Merge branch 'bookend_disable' of github.com:mszylkowski/amphtml into…
mszylkowski May 17, 2021
5b5da9e
Merge branch 'main' of github.com:ampproject/amphtml into remove_bookend
mszylkowski May 17, 2021
215123d
Fixed test
mszylkowski May 17, 2021
165fd77
Merge branch 'remove_bookendstrs' into remove_bookend
mszylkowski May 17, 2021
2aec8e1
Fixed request service tests
mszylkowski May 17, 2021
b36ca12
Fixed visual tests
mszylkowski May 17, 2021
1092f1c
Bring back validation tests for bookend
mszylkowski May 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ let numberStart = 1 + `/foo`;
let stringStart = '1' + `/foo`;
let numberEnd = `foo/` + 1;
let stringEnd = `foo/` + '1';
let illegalCharacterString = `Invalid share providers configuration for in bookend. ` + 'Value must be `true` or a params object.';
let illegalCharacterString = `Invalid share providers configuration for story. ` + 'Value must be `true` or a params object.';
let illegalCharacterTemplate = `Invalid ${x}` + 'Value must be `true` or a params object.';
let illegalEscapeValue = `Invalid ${x}` + '${foo}';

inverted: {
let illegalCharacterString = 'Value must be `true` or a params object. ' + `Invalid share providers configuration for in bookend.`;
let illegalCharacterString = 'Value must be `true` or a params object. ' + `Invalid share providers configuration for story.`;
let illegalCharacterTemplate = 'Value must be `true` or a params object. ' + `Invalid ${x}`;
let illegalEscapeValue = '${foo}' + `Invalid ${x}`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ let numberStart = "1/foo";
let stringStart = "1/foo";
let numberEnd = "foo/1";
let stringEnd = "foo/1";
let illegalCharacterString = "Invalid share providers configuration for in bookend. Value must be `true` or a params object.";
let illegalCharacterString = "Invalid share providers configuration for story. Value must be `true` or a params object.";
let illegalCharacterTemplate = `Invalid ${x}Value must be \`true\` or a params object.`;
let illegalEscapeValue = `Invalid ${x}\${foo}`;

inverted: {
let illegalCharacterString = "Value must be `true` or a params object. Invalid share providers configuration for in bookend.";
let illegalCharacterString = "Value must be `true` or a params object. Invalid share providers configuration for story.";
let illegalCharacterTemplate = `Value must be \`true\` or a params object. Invalid ${x}`;
let illegalEscapeValue = `\${foo}Invalid ${x}`;
}
Expand Down
1 change: 0 additions & 1 deletion build-system/compile/bundles.config.extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,6 @@
"options": {
"hasCss": true,
"cssBinaries": [
"amp-story-bookend",
"amp-story-consent",
"amp-story-draggable-drawer-header",
"amp-story-hint",
Expand Down
2 changes: 0 additions & 2 deletions build-system/test-configs/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,6 @@ const htmlFixtureGlobs = [
'!examples/visual-tests/amp-story-player/player-local-story.html',
'!examples/visual-tests/amp-story-player/story-attribution.html',
'!examples/visual-tests/amp-story/amp-story-360-image.html',
'!examples/visual-tests/amp-story/amp-story-bookend.html',
'!examples/visual-tests/amp-story/amp-story-bookend.rtl.html',
'!examples/visual-tests/amp-story/amp-story-bot-rendering.html',
'!examples/visual-tests/amp-story/amp-story-consent.html',
'!examples/visual-tests/amp-story/amp-story-consent.rtl.html',
Expand Down
3 changes: 0 additions & 3 deletions css/Z_INDEX.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
`.i-amphtml-story-button-container` | 100002 | [extensions/amp-story/1.0/pagination-buttons.css](/extensions/amp-story/1.0/pagination-buttons.css)
`.i-amphtml-ad-overlay-container` | 100001 | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-ad-badge.css)
`.i-amphtml-story-ad-progress-background` | 100001 | [extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css](/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads-progress-bar.css)
`.i-amphtml-story-bookend` | 100001 | [extensions/amp-story/1.0/amp-story-bookend.css](/extensions/amp-story/1.0/amp-story-bookend.css)
`.i-amphtml-story-info-dialog` | 100001 | [extensions/amp-story/1.0/amp-story-info-dialog.css](/extensions/amp-story/1.0/amp-story-info-dialog.css)
`.i-amphtml-story-progress-bar` | 100001 | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)
`.i-amphtml-story-focused-state-layer` | 100001 | [extensions/amp-story/1.0/amp-story-tooltip.css](/extensions/amp-story/1.0/amp-story-tooltip.css)
Expand Down Expand Up @@ -99,7 +98,6 @@
`.i-amphtml-story-access-header` | 2 | [extensions/amp-story/1.0/amp-story-access.css](/extensions/amp-story/1.0/amp-story-access.css)
`.i-amphtml-story-consent-header` | 2 | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)
`.i-amphtml-story-hint-container` | 2 | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)
`.i-amphtml-story-bookend-active amp-story-page[active]::after` | 2 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
`amp-story-grid-layer` | 2 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
`.amp-story-player-exit-control-button` | 1 | [css/amp-story-player-iframe.css](/css/amp-story-player-iframe.css)
`.i-amphtml-layout-size-defined > [fallback]` | 1 | [css/ampshared.css](/css/ampshared.css)
Expand Down Expand Up @@ -136,7 +134,6 @@
`.i-amphtml-story-consent-actions` | 1 | [extensions/amp-story/1.0/amp-story-consent.css](/extensions/amp-story/1.0/amp-story-consent.css)
`.i-amphtml-story-draggable-drawer-header` | 1 | [extensions/amp-story/1.0/amp-story-draggable-drawer-header.css](/extensions/amp-story/1.0/amp-story-draggable-drawer-header.css)
`.i-amphtml-story-hint-container .i-amphtml-story-hint-tap-button-icon` | 1 | [extensions/amp-story/1.0/amp-story-hint.css](/extensions/amp-story/1.0/amp-story-hint.css)
`.i-amphtml-story-bookend-active.i-amphtml-story-system-layer` | 1 | [extensions/amp-story/1.0/amp-story-system-layer.css](/extensions/amp-story/1.0/amp-story-system-layer.css)
`.i-amphtml-expanded-mode .i-amphtml-embedded-component.i-amphtml-expanded-component` | 1 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
`amp-story-page[active]` | 1 | [extensions/amp-story/1.0/amp-story.css](/extensions/amp-story/1.0/amp-story.css)
`.i-amphtml-stream-gallery-next` | 1 | [extensions/amp-stream-gallery/0.1/arrows.css](/extensions/amp-stream-gallery/0.1/arrows.css)
Expand Down
3 changes: 0 additions & 3 deletions examples/amp-story/ad-development.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ <h1>fifteen Page</h1>
<h1>sixteen Page</h1>
</amp-story-grid-layer>
</amp-story-page>

<amp-story-bookend src="../../examples/amp-story/bookendv1.json" layout="nodisplay">
</amp-story-bookend>
</amp-story>
</body>
</html>
5 changes: 0 additions & 5 deletions examples/amp-story/amp-story-animation.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@
</script>
</amp-story-animation>
</amp-story-page>

<amp-story-bookend
src="bookendv1.json"
layout="nodisplay"
></amp-story-bookend>
</amp-story>
</body>
</html>
2 changes: 1 addition & 1 deletion examples/amp-story/amp-story-branching.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"endpoint": "https://raw.githubusercontent.com/ampproject/amphtml/main/examples/img/ampicon.png",
"base": "${endpoint}?${type|default:foo}&path=${canonicalPath}",
"pageView": "${base}?&index=${storyPageIndex}&count=${storyPageCount}&id=${storyPageId}&muted=${storyIsMuted}&progress=${storyProgress}",
"click": "${base}?&index=${storyPageIndex}&id=${storyPageId}&bookendTargetHref=${storyBookendTargetHref}&bookendCardType=${storyBookendComponentType}&bookendCardPosition=${storyBookendComponentPosition}"
"click": "${base}?&index=${storyPageIndex}&id=${storyPageId}"
},
"triggers": {
"trackSideBarOpen": {
Expand Down
3 changes: 0 additions & 3 deletions examples/amp-story/ampconf.html
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,6 @@ <h1 grid-area="middle-third" class="bold">Join the worldwide AMP Roadshow</h1>
</a>
</amp-story-cta-layer>
</amp-story-page>

<amp-story-bookend src="./bookendv1.json" layout="nodisplay">
</amp-story-bookend>
</amp-story>
</body>
</html>
22 changes: 1 addition & 21 deletions examples/amp-story/analytics.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"endpoint": "https://raw.githubusercontent.com/ampproject/amphtml/main/examples/img/ampicon.png",
"base": "${endpoint}?${type|default:foo}&path=${canonicalPath}",
"pageView": "${base}?&index=${storyPageIndex}&count=${storyPageCount}&id=${storyPageId}&muted=${storyIsMuted}&progress=${storyProgress}",
"click": "${base}?&index=${storyPageIndex}&id=${storyPageId}&bookendTargetHref=${storyBookendTargetHref}&bookendCardType=${storyBookendComponentType}&bookendCardPosition=${storyBookendComponentPosition}"
"click": "${base}?&index=${storyPageIndex}&id=${storyPageId}"
},
"triggers": {
"trackAnchorClicks": {
Expand All @@ -54,13 +54,6 @@
"eventId": "clickOnAnyAnchor"
}
},
"trackBookendClicks": {
"on": "story-bookend-click",
"request": "click",
"vars": {
"eventId": "clickOnBookend"
}
},
"trackPageAttachmentOpen": {
"on": "story-open",
"tagName": "amp-story-page-attachment",
Expand Down Expand Up @@ -88,16 +81,6 @@
"repeat": false
}
},
"trackBookendEnter": {
"on": "story-open",
"tagName": "amp-story-bookend",
"request": "pageView"
},
"trackBookendExit": {
"on": "story-close",
"tagName": "amp-story-bookend",
"request": "pageView"
},
"trackAudioEnable": {
"on": "story-audio-muted",
"request": "pageView"
Expand Down Expand Up @@ -192,9 +175,6 @@ <h1>Page Five</h1>
</amp-video>
</amp-story-grid-layer>
</amp-story-page>

<amp-story-bookend src="bookendv1.json" layout="nodisplay">
</amp-story-bookend>
</amp-story>
</body>
</html>
46 changes: 2 additions & 44 deletions examples/amp-story/attachment.html
Original file line number Diff line number Diff line change
Expand Up @@ -343,62 +343,20 @@
</amp-story-grid-layer>
</amp-story-page>

<amp-story-bookend layout="nodisplay">
<amp-story-social-share layout="nodisplay">
<script type="application/json">
{
"bookendVersion": "v1.0",
"shareProviders": [
"email",
{"provider": "facebook", "app_id": "254325784911610"},
{"provider": "twitter", "text": "This is custom share text that I would like for the Twitter platform"},
"whatsapp",
"pinterest",
"line"
],
"components": [
{
"type": "heading",
"text": "test"
},
{
"type": "small",
"title": "This is an example article",
"url": "/article.html",
"image": "http://placehold.it/500x600"
},
{
"type": "small",
"title": "This is an example article2",
"url": "http://example.com/article.html",
"image": "http://placehold.it/256x128"
},
{
"type": "small",
"title": "This is an example article3",
"url": "http://example.com/article.html",
"image": "http://placehold.it/256x128"
},
{
"type": "heading",
"text": "test2"
},
{
"type": "small",
"title": "This is an example article",
"url": "http://example.com/article.html",
"image": "http://placehold.it/256x128"
},
{
"type": "portrait",
"title": "Heading for portrait",
"category": "This is an example portrait",
"url": "http://example.com/article.html",
"image": "http://placehold.it/350x470"
}
]
}
</script>
</amp-story-bookend>
</amp-story-social-share>
</amp-story>
</body>
</html>
3 changes: 0 additions & 3 deletions examples/amp-story/auto-analytics.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ <h1>Page Five</h1>
</amp-video>
</amp-story-grid-layer>
</amp-story-page>

<amp-story-bookend src="bookendv1.json" layout="nodisplay">
</amp-story-bookend>
</amp-story>
</body>
</html>
70 changes: 0 additions & 70 deletions examples/amp-story/bookend.html

This file was deleted.

15 changes: 0 additions & 15 deletions examples/amp-story/bookend.json

This file was deleted.

63 changes: 0 additions & 63 deletions examples/amp-story/bookendv1.html

This file was deleted.

Loading