amp-carousel: First phase of cleaning up snap experiment (#13620)

ampproject · Feb 23, 2018 · c56637b · c56637b
1 parent 1fdf92a
commit c56637b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/extensions/amp-carousel/0.1/slidescroll.js b/extensions/amp-carousel/0.1/slidescroll.js
@@ -23,7 +23,6 @@ import {createCustomEvent} from '../../../src/event-helper';
 import {dev} from '../../../src/log';
 import {getStyle, setStyle} from '../../../src/style';
 import {isConnectedNode} from '../../../src/dom';
-import {isExperimentOn} from '../../../src/experiments';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {numeric} from '../../../src/transition';
 import {startsWith} from '../../../src/string';
@@ -123,10 +122,8 @@ export class AmpSlideScroll extends BaseSlides {
     this.action_ = null;
 
     /** @private {boolean} */
-    this.shouldDisableCssSnap_ = isExperimentOn(this.win,
-        'slidescroll-disable-css-snap') &&
-        startsWith(
-            Services.platformFor(this.win).getIosVersionString(), '10.3');
+    this.shouldDisableCssSnap_ = startsWith(
+        Services.platformFor(this.win).getIosVersionString(), '10.3');
   }
 
   /** @override */

diff --git a/test/manual/amp-slidescroll.amp.html b/test/manual/amp-slidescroll.amp.html
@@ -43,8 +43,6 @@
 </head>
 <body>
   <h1>amp #0</h1>
-  <button onclick="AMP.toggleExperiment('slidescroll-disable-css-snap');window.location.href=window.location.href;">Toggle CSS SNAP</button>
-
   <h1>No Loops for you</h1>
   <amp-carousel id="carousel-1" width=400 height=300 type=slides controls>
     <amp-img src="https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-Rf78IofLb9QjS5_0mqsY1zEFc=w300-h200-no" layout=fill></amp-img>

diff --git a/tools/experiments/experiments.js b/tools/experiments/experiments.js
@@ -189,12 +189,6 @@ const EXPERIMENTS = [
     id: 'jank-meter',
     name: 'Display jank meter',
   },
-  {
-    id: 'slidescroll-disable-css-snap',
-    name: 'Slidescroll disable css snap',
-    cleanupIssue: 'https://github.com/ampproject/amphtml/issues/8195',
-    spec: 'https://github.com/ampproject/amphtml/issues/7670',
-  },
   {
     id: '3p-use-ampcontext',
     name: 'Use AmpContext for window.context messaging',