[MediaWiki-commits] [Gerrit] mediawiki.action.edit: Merge with mediawiki.action.edit.stash - change (mediawiki/core)

2016-06-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

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


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
---
M includes/EditPage.php
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
3 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 66ee161..3292f70 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2242,10 +2242,6 @@
$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 @@
$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
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1408,12 +1408,16 @@
/* 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',
],
@@ -1454,13 +1458,6 @@
'subject-preview',
'parentheses',
'previewerrortext',
-   ],
-   ],
-   'mediawiki.action.edit.stash' => [
-   'scripts' => 
'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
-   'dependencies' => [
-   'jquery.getAttrs',
-   'mediawiki.api',
],
],
'mediawiki.action.history' => [
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
--- 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(),

-- 
To view, visit https://gerrit.wikimedia.org/r/293564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic32da6f9b1c85eb106394b412fab9b22e0928323
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki.action.edit: Merge with mediawiki.action.edit.stash - change (mediawiki/core)

2016-06-09 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293564

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

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
---
M includes/EditPage.php
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
3 files changed, 13 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/293564/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f2403fe..9a5fb35 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2242,10 +2242,6 @@
$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 @@
$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 1e80c26..63c0281 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1406,12 +1406,16 @@
/* 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',
],
@@ -1452,13 +1456,6 @@
'subject-preview',
'parentheses',
'previewerrortext',
-   ],
-   ],
-   'mediawiki.action.edit.stash' => [
-   'scripts' => 
'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
-   'dependencies' => [
-   'jquery.getAttrs',
-   'mediawiki.api',
],
],
'mediawiki.action.history' => [
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js 
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 20bfa0e..8bc1845 100644
--- 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(),

-- 
To view, visit https://gerrit.wikimedia.org/r/293564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic32da6f9b1c85eb106394b412fab9b22e0928323
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits