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

🐛 Prevent toggle() from throwing error when no elements are selected. #20795

Merged
merged 6 commits into from
Feb 15, 2019
Merged

🐛 Prevent toggle() from throwing error when no elements are selected. #20795

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55168f8
Check for undefined parameter in clearSelection_()
caroqliu Feb 12, 2019
fa0e71a
Create example file to test changes locally.
caroqliu Feb 12, 2019
007a5b9
Reorganize elements in <head>
caroqliu Feb 12, 2019
b896a0e
Remove guard from clearSelection()
caroqliu Feb 12, 2019
60146fd
Add undefined check to toggle() before calling clearSelection()
caroqliu Feb 12, 2019
8fa3487
Add undefined check to select() before calling clearSelection()
caroqliu Feb 12, 2019
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
59 changes: 59 additions & 0 deletions examples/selector.amp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!doctype html>
<html ⚡>
<head>
<meta charset="utf-8">
<script async src="https://cdn.ampproject.org/v0.js"></script>
<title>AMP Selector Demo</title>
<link rel="canonical" href="amps.html">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
<script async custom-element="amp-selector" src="https://cdn.ampproject.org/v0/amp-selector-0.1.js"></script>
</head>
<body>
<h1>Selector Examples</h1>
<h2>Single Select</h2>
<amp-selector class="sample-selector"
layout="container">
<ul>
<li option="1">Option 1</li>
<li option="2">Option 2</li>
<li option="3">Option 3</li>
<li option="4">Option 4</li>
</ul>
</amp-selector>

<h2>Multi Select</h2>
<amp-selector layout="container"
class="sample-selector"
multiple>
<ul>
<li option="1">Option 1</li>
<li option="2">Option 2</li>
<li option="3">Option 3</li>
<li option="4">Option 4</li>
</ul>
</amp-selector>

<h2>Actions</h2>
<amp-selector id="actionsSample"
layout="container"
class="sample-selector"
multiple>
<ul>
<li option="1">Option 1</li>
<li option="2">Option 2</li>
<li option="3">Option 3</li>
<li option="4">Option 4</li>
<li option="5">Option 5</li>
<li option="6">Option 6</li>
</ul>
</amp-selector>
<button on="tap:actionsSample.clear">clear</button>
<button on="tap:actionsSample.selectUp">selectUp</button>
<button on="tap:actionsSample.selectUp(delta=2)">selectUp(delta=2)</button>
<button on="tap:actionsSample.selectDown">selectDown</button>
<button on="tap:actionsSample.selectDown(delta=2)">selectDown(delta=2)</button>
<button on="tap:actionsSample.toggle(index=1)">toggle(index=1)</button>
<button on="tap:actionsSample.toggle(index=1, value=true)">toggle(index=1, value=true)</button>
</body>
</html>
12 changes: 7 additions & 5 deletions extensions/amp-selector/0.1/amp-selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,13 @@ export class AmpSelector extends AMP.BaseElement {
* @private
*/
clearSelection_(element) {
element.removeAttribute('selected');
element.setAttribute('aria-selected', 'false');
const selIndex = this.selectedElements_.indexOf(element);
if (selIndex !== -1) {
this.selectedElements_.splice(selIndex, 1);
if (element !== undefined) {
caroqliu marked this conversation as resolved.
Show resolved Hide resolved
element.removeAttribute('selected');
element.setAttribute('aria-selected', 'false');
const selIndex = this.selectedElements_.indexOf(element);
if (selIndex !== -1) {
this.selectedElements_.splice(selIndex, 1);
}
}
}

Expand Down