[amp-sidebar 1.0] Un-version sidebar 1.0 #10796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
camelburrito
suggested changes
Aug 4, 2017
| @@ -15,13 +15,19 @@ | |||
| */ | |||
|
|
|||
| import {CSS} from '../../../build/amp-sidebar-0.1.css'; | |||
| import {Layout} from '../../../src/layout'; | |||
| import {dev, user} from '../../../src/log'; | |||
| import {isExperimentOn} from '../../../src/experiments'; | |||
| import {KeyCodes} from '../../../src/utils/key-codes'; | |||
| toArray(this.element.querySelectorAll('nav[toolbar]')); | ||
|
|
||
| if (toolbarElements.length > 0) { | ||
| user().assert(isExperimentOn(this.win, TAG), |
There was a problem hiding this comment.
move the experiment check above - don't assert
| /** @override */ | ||
| onLayoutMeasure() { | ||
| // Check our toolbars for changes | ||
| this.toolbars_.forEach(toolbar => { |
| </ul> | ||
| </amp-sidebar> | ||
| ``` | ||
|
|
||
| *Example: Advanced usage of `amp-sidebar` with anchor links and smooth scrolling* | ||
|
|
There was a problem hiding this comment.
This is not advanced usage - make this a part of the default example
| @@ -54,6 +55,52 @@ describes.realWin('amp-sidebar 0.1 version', { | |||
| const anchor = iframe.doc.createElement('a'); | |||
| anchor.href = '#section1'; | |||
| ampSidebar.appendChild(anchor); | |||
| if (options.toolbars) { | |||
There was a problem hiding this comment.
create a separate describe for tests with toolbar
camelburrito
suggested changes
Aug 4, 2017
| return Promise.resolve(); | ||
| }); | ||
| // Create our individual toolbars | ||
| options.toolbars.forEach(toolbarObj => { |
There was a problem hiding this comment.
move this to its own function
| @@ -104,6 +117,89 @@ Example: | |||
| <button on='tap:sidebar1.close'>x</button> | |||
| ``` | |||
|
|
|||
| ### Toolbar | |||
There was a problem hiding this comment.
mark it as experimental (Experimental)
camelburrito
approved these changes
Aug 4, 2017
camelburrito
approved these changes
Aug 4, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #10770
By request of the validation team, and approval by @camelburrito and @dvoytenko , this PR will unversion sidebar.
toolbarwill now live as a feature toamp-sidebar, and is hidden under the experimental flag,amp-sidebar toolbar. This PR does the following changes:History of toolbar.js to ensure it has not changed since PR was opened: https://github.com/ampproject/amphtml/commits/master/extensions/amp-sidebar/1.0/toolbar.js
See the screenshots below showing it will not affect current users, but only experimental toolbar users: