TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200750
Change subject: Introduce wikipage.editform hook
......................................................................
Introduce wikipage.editform hook
* New wikipage.editform hook (Bug T53583)
* Make editpage module emit wikipage.editform
* Make collapsibleFooter setup the .hiddencats .limitreport and
.templatesUsed elements from the wikipage.editform hook
Bug: T55918
Change-Id: I515f7cdf4a6bbff2da3670946a12dc8027507226
---
M resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
M resources/src/mediawiki.action/mediawiki.action.edit.js
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
3 files changed, 21 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/200750/1
diff --git
a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
index 7ae51ab..125a39f 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
@@ -1,21 +1,21 @@
-jQuery( document ).ready( function ( $ ) {
+( function ( mw, $ ) {
var collapsibleLists, i, handleOne;
// Collapsible lists of categories and templates
collapsibleLists = [
{
- $list: $( '.templatesUsed ul' ),
- $toggler: $( '.mw-templatesUsedExplanation' ),
+ listSel: '.templatesUsed ul',
+ togglerSel: '.mw-templatesUsedExplanation',
cookieName: 'templates-used-list'
},
{
- $list: $( '.hiddencats ul' ),
- $toggler: $( '.mw-hiddenCategoriesExplanation' ),
+ listSel: '.hiddencats ul',
+ togglerSel: '.mw-hiddenCategoriesExplanation',
cookieName: 'hidden-categories-list'
},
{
- $list: $( '.preview-limit-report-wrapper' ),
- $toggler: $( '.mw-limitReportExplanation' ),
+ listSel: '.preview-limit-report-wrapper',
+ togglerSel: '.mw-limitReportExplanation',
cookieName: 'preview-limit-report'
}
];
@@ -47,8 +47,15 @@
} );
};
- for ( i = 0; i < collapsibleLists.length; i++ ) {
- // Pass to a function for iteration-local variables
- handleOne( collapsibleLists[i].$list,
collapsibleLists[i].$toggler, collapsibleLists[i].cookieName );
- }
-} );
+ mw.hook( 'wikipage.editform' ).add( function( $editForm ) {
+ var i;
+ for ( i = 0; i < collapsibleLists.length; i++ ) {
+ // Pass to a function for iteration-local variables
+ handleOne(
+ $editForm.find( collapsibleLists[i].listSel ),
+ $editForm.find( collapsibleLists[i].togglerSel
),
+ collapsibleLists[i].cookieName
+ );
+ }
+ } );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js
b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 01a25f3..5a4445b 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -12,6 +12,7 @@
editBox = document.getElementById( 'wpTextbox1' );
scrollTop = document.getElementById( 'wpScrolltop' );
$editForm = $( '#editform' );
+ mw.hook( 'wikipage.editform' ).fire( $editForm );
if ( $editForm.length && editBox && scrollTop ) {
if ( scrollTop.value ) {
editBox.scrollTop = scrollTop.value;
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index f24703a..4dece9c 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -222,6 +222,7 @@
)
);
}
+ mw.hook( 'wikipage.editform' ).fire( $editform );
} );
request.always( function () {
$spinner.remove();
--
To view, visit https://gerrit.wikimedia.org/r/200750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I515f7cdf4a6bbff2da3670946a12dc8027507226
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
