From ebc85989184e601ff1662491c5232bb701751d74 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Tue, 4 Sep 2018 09:51:49 +0200
Subject: [PATCH] Replace $.proxy by Function.prototype.bind

Also prevent further usage by an eslint rule.

jQuery.proxy is deprecated:
* https://github.com/jquery/jquery/issues/2958

Bug: T200877
Change-Id: I3a4977f9b90c2104db320d2d939a1cbaa1819de0
---
 .eslintrc.json                                              | 5 +++++
 resources/src/mediawiki.api/messages.js                     | 2 +-
 resources/src/mediawiki.special.preferences/confirmClose.js | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index f7a79ac261..f08861759b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -44,6 +44,11 @@
 				"object": "$",
 				"property": "trim",
 				"message": "Please use String.prototype.trim instead"
+			},
+			{
+				"object": "$",
+				"property": "proxy",
+				"message": "Please use Function.prototype.bind instead"
 			}
 		],
 		"dot-notation": 0,
diff --git a/resources/src/mediawiki.api/messages.js b/resources/src/mediawiki.api/messages.js
index 44bba8b8aa..824cc190f4 100644
--- a/resources/src/mediawiki.api/messages.js
+++ b/resources/src/mediawiki.api/messages.js
@@ -46,7 +46,7 @@
 		 * @return {jQuery.Promise}
 		 */
 		loadMessages: function ( messages, options ) {
-			return this.getMessages( messages, options ).then( $.proxy( mw.messages, 'set' ) );
+			return this.getMessages( messages, options ).then( mw.messages.set.bind( mw.messages ) );
 		},
 
 		/**
diff --git a/resources/src/mediawiki.special.preferences/confirmClose.js b/resources/src/mediawiki.special.preferences/confirmClose.js
index 244154b38a..bf65ae92b9 100644
--- a/resources/src/mediawiki.special.preferences/confirmClose.js
+++ b/resources/src/mediawiki.special.preferences/confirmClose.js
@@ -71,7 +71,7 @@
 			message: mw.msg( 'prefswarning-warning', mw.msg( 'saveprefs' ) ),
 			namespace: 'prefswarning'
 		} );
-		$( '#mw-prefs-form' ).on( 'submit', $.proxy( allowCloseWindow, 'release' ) );
+		$( '#mw-prefs-form' ).on( 'submit', allowCloseWindow.release );
 		if ( oouiEnabled ) {
 			restoreButton.on( 'click', function () {
 				allowCloseWindow.release();
@@ -80,7 +80,7 @@
 				location.href = restoreButton.getHref();
 			} );
 		} else {
-			$( '#mw-prefs-restoreprefs' ).on( 'click', $.proxy( allowCloseWindow, 'release' ) );
+			$( '#mw-prefs-restoreprefs' ).on( 'click', allowCloseWindow.release );
 		}
 	} );
 }( mediaWiki, jQuery ) );
-- 
2.20.1