mediawiki.action.edit: Merge with mediawiki.action.edit.stash

This module isn't used anywhere else. It was probably put into a
separate module due to the conditional loading. Though that can
be done client-side just as easily.

If we want to make it loaded conditionally, we could make the
module composition conditionally (which is straight-forward since
the condition doesn't vary on anything within the wiki).

* Follow-up 3a6c9d36: Remove 'jquery.getAttrs' from dependencies (unused).

Change-Id: Ic32da6f9b1c85eb106394b412fab9b22e0928323

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 66ee161..3292f70 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2242,10 +2242,6 @@ class EditPage {
                        $wgOut->addModules( 'mediawiki.action.edit.editWarning' );
                }
 
-               if ( $wgAjaxEditStash ) {
-                       $wgOut->addModules( 'mediawiki.action.edit.stash' );
-               }
-
                # Enabled article-related sidebar, toplinks, etc.
                $wgOut->setArticleRelated( true );
 
@@ -2273,7 +2269,10 @@ class EditPage {
                $wgOut->setPageTitle( wfMessage( $msg, $displayTitle ) );
                # Transmit the name of the message to JavaScript for live preview
                # Keep Resources.php/mediawiki.action.edit.preview in sync with the possible keys
-               $wgOut->addJsConfigVars( 'wgEditMessage', $msg );
+               $wgOut->addJsConfigVars( [
+                       'wgEditMessage' => $msg,
+                       'wgAjaxEditStash' => $wgAjaxEditStash,
+               ] );
        }
 
        /**

diff --git a/resources/Resources.php b/resources/Resources.php
index 150b8d3..c2724af 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1408,12 +1408,16 @@ return [
        /* MediaWiki Action */
 
        'mediawiki.action.edit' => [
-               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
+               'scripts' => [
+                       'resources/src/mediawiki.action/mediawiki.action.edit.js',
+                       'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
+               ],
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => [
                        'mediawiki.action.edit.styles',
                        'jquery.textSelection',
                        'jquery.byteLimit',
+                       'mediawiki.api',
                ],
                'position' => 'top',
        ],
@@ -1456,13 +1460,6 @@ return [
                        'previewerrortext',
                ],
        ],
-       'mediawiki.action.edit.stash' => [
-               'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
-               'dependencies' => [
-                       'jquery.getAttrs',
-                       'mediawiki.api',
-               ],
-       ],
        'mediawiki.action.history' => [
                'position' => 'top',
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 297f814..2069ac5 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -2,6 +2,10 @@
  * Scripts for pre-emptive edit preparing on action=edit
  */
 ( function ( mw, $ ) {
+       if ( !mw.config.get( 'wgAjaxEditStash' ) ) {
+               return;
+       }
+
        $( function () {
                var idleTimeout = 3000,
                        api = new mw.Api(),