From 58729578aed1caf6a055f79589a3ab3b59c265f4 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 27 Oct 2017 13:09:46 -0400
Subject: [PATCH] BetaOptin now managed by MobileFrontend

Depends-On: I83dc2165081332453cd6fc586ae7a3ba04bd3416
Change-Id: I11200f0ff90b359e363ea7a95bf4f3b9e92a67b4
---
 resources/skins.minerva.scripts/init.js | 38 ++-----------------------
 skin.json                               |  3 +-
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/resources/skins.minerva.scripts/init.js b/resources/skins.minerva.scripts/init.js
index 0b5a3cd..c6bd0be 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -1,22 +1,17 @@
 ( function ( M, $ ) {
-	var inSample, inStable, experiment,
+	var
 		config = mw.config,
 		toast = M.require( 'mobile.startup/toast' ),
 		time = M.require( 'mobile.startup/time' ),
 		skin = M.require( 'mobile.init/skin' ),
 		DownloadIcon = M.require( 'skins.minerva.scripts/DownloadIcon' ),
 		browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
-		token = mw.storage.get( 'mobile-betaoptin-token' ),
-		BetaOptinPanel = M.require( 'mobile.betaoptin/BetaOptinPanel' ),
 		loader = M.require( 'mobile.startup/rlModuleLoader' ),
 		router = require( 'mediawiki.router' ),
-		context = M.require( 'mobile.startup/context' ),
 		OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
 		overlayManager = new OverlayManager( require( 'mediawiki.router' ) ),
 		page = M.getCurrentPage(),
-		thumbs = page.getThumbnails(),
-		experiments = mw.config.get( 'wgMFExperiments' ) || {},
-		betaOptinPanel;
+		thumbs = page.getThumbnails();
 
 	/**
 	 * Event handler for clicking on an image thumbnail
@@ -144,35 +139,6 @@
 		initMediaViewer();
 	} );
 
-	// Access the beta optin experiment if available.
-	experiment = experiments.betaoptin || false;
-	// local storage is supported in this case, when ~ means it was dismissed
-	if ( experiment && token !== false && token !== '~' && !page.isMainPage() && !page.inNamespace( 'special' ) ) {
-		if ( !token ) {
-			token = mw.user.generateRandomSessionId();
-			mw.storage.set( 'mobile-betaoptin-token', token );
-		}
-
-		inStable = context.getMode() === 'stable';
-		inSample = mw.experiments.getBucket( experiment, token ) === 'A';
-		if ( inStable && ( inSample || mw.util.getParamValue( 'debug' ) ) ) {
-			betaOptinPanel = new BetaOptinPanel( {
-				postUrl: mw.util.getUrl( 'Special:MobileOptions', {
-					returnto: page.title
-				} )
-			} )
-				.on( 'hide', function () {
-					mw.storage.set( 'mobile-betaoptin-token', '~' );
-				} )
-				.appendTo( M.getCurrentPage().getLeadSectionElement() );
-		}
-	}
-
-	// let the interested parties know whether the panel is shown
-	mw.track( 'minerva.betaoptin', {
-		isPanelShown: betaOptinPanel !== undefined
-	} );
-
 	/**
 	 * Initialisation function for last modified module.
 	 *
diff --git a/skin.json b/skin.json
index 890c2e3..174a670 100644
--- a/skin.json
+++ b/skin.json
@@ -261,8 +261,7 @@
 				"mobile.issues",
 				"mobile.search.api",
 				"mobile.search",
-				"mobile.references",
-				"mobile.betaoptin"
+				"mobile.references"
 			],
 			"messages": [
 				"edithelp",