From 39657be39baf31599ee6216545590790c43051df Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Sat, 7 Oct 2017 18:35:14 +0200
Subject: [PATCH 1/1] Remove mw.page

mw.page was deprecated in b3fb2770 in MediaWiki 1.30.

Change-Id: Ia2f040549bb83445a8efcd5841bb64cfc5eee50e
---
 RELEASE-NOTES-1.31                    |  1 +
 maintenance/jsduck/categories.json    |  6 ------
 resources/Resources.php               |  1 -
 resources/src/mediawiki/page/watch.js | 19 +++++++++++--------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 498c473bb1..5d2d9d9e82 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -48,6 +48,7 @@ changes to languages because of Phabricator reports.
   Maintenance::countDown()
 * The OutputPage class constructor now requires a context parameter,
   (instantiating without context was deprecated in 1.18)
+* mw.page (deprecated in 1.30) was removed.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/maintenance/jsduck/categories.json b/maintenance/jsduck/categories.json
index 899d80daa7..3623593762 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -53,12 +53,6 @@
 					"mw.jqueryMsg"
 				]
 			},
-			{
-				"name": "Page",
-				"classes": [
-					"mw.page*"
-				]
-			},
 			{
 				"name": "Interfaces",
 				"classes": [
diff --git a/resources/Resources.php b/resources/Resources.php
index 06012b8f9f..6ae88b1d2f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1705,7 +1705,6 @@ return [
 	'mediawiki.page.watch.ajax' => [
 		'scripts' => 'resources/src/mediawiki/page/watch.js',
 		'dependencies' => [
-			'mediawiki.page.startup',
 			'mediawiki.api.watch',
 			'mediawiki.notify',
 			'mediawiki.util',
diff --git a/resources/src/mediawiki/page/watch.js b/resources/src/mediawiki/page/watch.js
index e56e807899..5b55bb2d72 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -2,7 +2,17 @@
  * Animate watch/unwatch links to use asynchronous API requests to
  * watch pages, rather than navigating to a different URI.
  *
- * @class mw.page.watch.ajax
+ * Usage:
+ *
+ *     var watch = require( 'mediawiki.page.watch.ajax' );
+ *     watch.updateWatchLink(
+ *         $node,
+ *         'watch',
+ *         'loading'
+ *     );
+ *
+ * @class mw.plugin.page.watch.ajax
+ * @singleton
  */
 ( function ( mw, $ ) {
 	var watch,
@@ -102,13 +112,6 @@
 	};
 	module.exports = watch;
 
-	// Deprecated since 1.30
-	mw.log.deprecate( mw, 'page',
-		{ watch: watch },
-		'Use require( \'mediawiki.page.watch.ajax\' ) instead.',
-		'mw.page'
-	);
-
 	$( function () {
 		var $links = $( '.mw-watchlink a[data-mw="interface"], a.mw-watchlink[data-mw="interface"]' );
 		if ( !$links.length ) {
-- 
2.20.1