Merge "Fix changes list misaligned arrow"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 498c473..5d2d9d9 100644 (file)
--- 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 899d80d..3623593 100644 (file)
--- 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 06012b8..6ae88b1 100644 (file)
--- 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 e56e807..5b55bb2 100644 (file)
--- 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 ) {