From 0dfdbadb4bdf94d3d4772f7b65c9f829a8b621a3 Mon Sep 17 00:00:00 2001
From: Stephen Niedzielski <stephen@niedzielski.com>
Date: Tue, 5 Feb 2019 13:54:10 -0700
Subject: [PATCH] Hygiene: migrate View.events to constructor prop

Migrate View.events to constructor property. MobileFrontend supports
both the deprecated View.prototype.events and recently passing events as
an argument at construction (see dependent patch).

As a client, Minerva doesn't provide nearly so many extensible classes
as MobileFrontend. The classes changed in this patch are no different so
events are not expected to be extended.

Bug: T208915
Depends-On: Ic193e97b4cd6f72d226bd9768e904bdec168ba39
Change-Id: I68923e2dfd4b2f3e3f3de5185e9b65ab0b665ab7
---
 resources/skins.minerva.options/BackToTopOverlay.js | 6 ++----
 resources/skins.minerva.scripts/init.js             | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/resources/skins.minerva.options/BackToTopOverlay.js b/resources/skins.minerva.options/BackToTopOverlay.js
index b5cb9a2..f5fa416 100644
--- a/resources/skins.minerva.options/BackToTopOverlay.js
+++ b/resources/skins.minerva.options/BackToTopOverlay.js
@@ -12,16 +12,14 @@
 	function BackToTopOverlay( props ) {
 		View.call( this,
 			util.extend( {}, props, {
-				className: 'backtotop'
+				className: 'backtotop',
+				events: { click: 'onBackToTopClick' }
 			} )
 		);
 	}
 
 	OO.mfExtend( BackToTopOverlay, View, {
 		template: mw.template.get( 'skins.minerva.options', 'BackToTopOverlay.hogan' ),
-		events: $.extend( {}, View.prototype.events, {
-			click: 'onBackToTopClick'
-		} ),
 
 		/**
 		 * Show the back to top element, if it's not visible already.
diff --git a/resources/skins.minerva.scripts/init.js b/resources/skins.minerva.scripts/init.js
index a0d0221..378c445 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -12,7 +12,6 @@
 		Icon = M.require( 'mobile.startup/Icon' ),
 		Button = M.require( 'mobile.startup/Button' ),
 		Anchor = M.require( 'mobile.startup/Anchor' ),
-		util = M.require( 'mobile.startup/util' ),
 		overlayManager = OverlayManager.getSingleton(),
 		page = M.getCurrentPage(),
 		api = new mw.Api(),
@@ -301,9 +300,9 @@
 						label: mw.msg( 'mobile-frontend-editor-redlink-leave' ),
 						additionalClassNames: 'hide'
 					} ).options,
-					events: util.extend( {}, CtaDrawer.prototype.events, {
+					events: {
 						'click .hide': 'hide' // Call CtaDrawer.hide() on closeAnchor click.
-					} ),
+					},
 					content: mw.msg( 'mobile-frontend-editor-redlink-explain' ),
 					actionAnchor: false
 				},