Skip to content

amp-selector: Clean up amp-selector experiment #7305

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

Merged
camelburrito merged 1 commit into from
Feb 2, 2017
Merged

amp-selector: Clean up amp-selector experiment #7305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion build-system/global-configs/canary-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"amp-apester-media": 1,
"amp-accordion-session-state-optout": 1,
"amp-playbuzz": 1,
"amp-selector": 1,
"sentinel-name-change": 1,
"chunked-amp": 1
}
3 changes: 1 addition & 2 deletions build-system/global-configs/prod-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
"ios-embed-wrapper": 1,
"amp-apester-media": 1,
"amp-accordion-session-state-optout": 1,
"amp-playbuzz": 1,
"amp-selector": 1
"amp-playbuzz": 1
}
5 changes: 1 addition & 4 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 @@ -17,8 +17,7 @@
import {CSS} from '../../../build/amp-selector-0.1.css';
import {actionServiceForDoc} from '../../../src/action';
import {closest} from '../../../src/dom';
import {dev, user} from '../../../src/log';
import {isExperimentOn} from '../../../src/experiments';
import {dev} from '../../../src/log';

export class AmpSelector extends AMP.BaseElement {
/** @param {!AmpElement} element */
Expand Down Expand Up @@ -51,8 +50,6 @@ export class AmpSelector extends AMP.BaseElement {

/** @override */
buildCallback() {
user().assert(isExperimentOn(this.win, 'amp-selector'),
`Experiment amp-selector is disabled.`);
this.isMultiple_ = this.element.hasAttribute('multiple');
this.isDisabled_ = this.element.hasAttribute('disabled');

Expand Down
9 changes: 0 additions & 9 deletions extensions/amp-selector/0.1/test/test-amp-selector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

import '../amp-selector';
import {toggleExperiment} from '../../../../src/experiments';

describes.realWin('amp-selector', {
win: { /* window spec */
Expand All @@ -30,14 +29,6 @@ describes.realWin('amp-selector', {
let win;
describe('test extension', () => {

beforeEach(() => {
toggleExperiment(window, 'amp-selector', true);
});

afterEach(() => {
toggleExperiment(window, 'amp-selector', false);
});

function getSelector(options) {
win = env.win;
const attributes = options.attributes || {};
Expand Down
1 change: 0 additions & 1 deletion test/manual/amp-selector.amp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<script async src="../../dist/amp.js"></script>
</head>
<body>
<button onclick="AMP.toggleExperiment('amp-selector');window.location.href=window.location.href;">Toggle Experiment</button>
<form action="/test/manual/amp-selector.amp.html" method="get" target="_blank" id="form1">
<amp-selector layout="container" name="single_image_select">
<div option="xyz" selected>Select me</div>
Expand Down
7 changes: 0 additions & 7 deletions tools/experiments/experiments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,6 @@ const EXPERIMENTS = [
name: 'New visibility tracking using native IntersectionObserver',
cleanupIssue: 'https://github.com/ampproject/amphtml/issues/6254',
},
{
id: 'amp-selector',
name: 'Amp selector extension',
cleanupIssue: 'https://github.com/ampproject/amphtml/issues/6168',
spec: 'https://github.com/ampproject/amphtml/blob/master/extensions/' +
'amp-selector/amp-selector.md',
},
{
id: 'amp-accordion-session-state-optout',
name: 'AMP Accordion attribute to opt out of preserved state.',
Expand Down