Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262735
Change subject: Rework JavaScript
......................................................................
Rework JavaScript
* Support LivePreview by using hook 'wikipage.content'
* Avoid unnecessary public object mw.tocTree
* Apply coding conventions for JavaScript
** Closure
** $( '<span>' ) instead of $( '<span/>' )
Change-Id: Ibe9e37fe009314a4da9488c23a9fd757c41b16ee
---
M modules/ext.toctree.js
1 file changed, 11 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TocTree
refs/changes/35/262735/1
diff --git a/modules/ext.toctree.js b/modules/ext.toctree.js
index b091e10..30b6f7b 100644
--- a/modules/ext.toctree.js
+++ b/modules/ext.toctree.js
@@ -11,8 +11,8 @@
* @licence GNU General Public Licence 2.0 or later
*/
-mw.tocTree = {
- processClickEvent: function ( event ) {
+( function ( mw, $ ) {
+ function processClickEvent( event ) {
var $ul = $( 'ul', $( this ).parent().parent() );
$ul.toggle();
@@ -25,10 +25,10 @@
.text( '+' )
.attr( 'title', mw.msg( 'showtoc' ) );
}
- },
+ }
- init: function() {
- var $toc = $( '#toc' );
+ function init( $content ) {
+ var $toc = $content.find( '#toc' );
if ( $toc.length > 0 ) {
if ( mw.user.options.get( 'toc-floated' ) ) {
@@ -39,7 +39,7 @@
var $mainUl = $( 'ul:first', $toc );
var $mainList = $( 'li', $toc );
- $mainList.each( function( i ) {
+ $mainList.each( function ( i ) {
if ( $( this ).hasClass( 'toclevel-1' ) ) {
$( this ).css( 'position', 'relative' );
var $subList = $( 'ul', $( this ) );
@@ -49,7 +49,7 @@
$mainUl.addClass(
'tocUl' );
}
- var $toggleLink = $( '<span />'
).addClass( 'toggleSymbol' );
+ var $toggleLink = $( '<span>'
).addClass( 'toggleSymbol' );
if ( mw.user.options.get(
'toc-expand' ) ) {
$toggleLink
@@ -64,9 +64,9 @@
$subList.hide();
}
- $toggleLink.click(
mw.tocTree.processClickEvent );
+ $toggleLink.click(
processClickEvent );
- var $toggleSpan = $( '<span />'
).addClass( 'toggleNode' );
+ var $toggleSpan = $( '<span>'
).addClass( 'toggleNode' );
$toggleSpan.append( '[',
$toggleLink, ']' );
$( this ).prepend( $toggleSpan
);
@@ -74,11 +74,7 @@
}
} );
}
-
- return true;
}
-};
-jQuery( function( $ ) {
- mw.tocTree.init();
-} );
+ mw.hook( 'wikipage.content' ).add( init );
+}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/262735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe9e37fe009314a4da9488c23a9fd757c41b16ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TocTree
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
