Jdlrobson has submitted this change and it was merged.
Change subject: Regression: Fix section-rendered callbacks
......................................................................
Regression: Fix section-rendered callbacks
And some code cleanup in mf-tables.js
Change-Id: I7d6c40a965e2ddd6e21b4f79b2d85ad6ab8de6cd
---
M javascripts/modules/mf-inline-style-scrubber.js
M javascripts/modules/mf-references.js
M javascripts/modules/mf-tables.js
3 files changed, 16 insertions(+), 22 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
diff --git a/javascripts/modules/mf-inline-style-scrubber.js
b/javascripts/modules/mf-inline-style-scrubber.js
index 8e04a31..86ed618 100644
--- a/javascripts/modules/mf-inline-style-scrubber.js
+++ b/javascripts/modules/mf-inline-style-scrubber.js
@@ -7,11 +7,11 @@
$container.find( '[style]' ).removeAttr( 'style' );
}
- M.on( 'section-rendered', function( ev, $container ) {
- scrub( $container );
- } ).on( 'page-loaded', function() {
- scrub( $( '#content_0' ) );
- } );
+ M.
+ on( 'section-rendered', scrub ).
+ on( 'page-loaded', function() {
+ scrub( $( '#content_0' ) );
+ } );
scrub( $( '#content' ) );
} );
diff --git a/javascripts/modules/mf-references.js
b/javascripts/modules/mf-references.js
index fddeec2..b03b9eb 100644
--- a/javascripts/modules/mf-references.js
+++ b/javascripts/modules/mf-references.js
@@ -66,11 +66,11 @@
function init() {
if ( inBeta ) {
- M.on( 'page-loaded', function() {
- setupReferences( $( '#content' )[ 0 ] );
- } ).on( 'section-rendered', function( ev,
container ) {
- setupReferences( container );
- } );
+ M.
+ on( 'page-loaded', function() {
+ setupReferences( $( '#content'
)[ 0 ] );
+ } ).
+ on( 'section-rendered', setupReferences
);
} else {
setupReferences.apply( this, arguments );
}
diff --git a/javascripts/modules/mf-tables.js b/javascripts/modules/mf-tables.js
index eba93e5..67b287a 100644
--- a/javascripts/modules/mf-tables.js
+++ b/javascripts/modules/mf-tables.js
@@ -1,9 +1,9 @@
( function( M, $ ) {
-var module = (function() {
+( function() {
var STEP_SIZE = 150;
- function initTables( ev, container ) {
+ function initTables( container ) {
var nav = M.require( 'navigation' ),
$tables = container ? $( container ).find( 'table' ) :
$( 'table' );
@@ -51,17 +51,11 @@
} );
}
- M.on( 'page-loaded',
- function() {
+ M.
+ on( 'page-loaded', function() {
initTables( $( '#content_0' ) );
- } ).on( 'section-rendered', function( ev, container ) {
- initTables( ev, container );
- } );
-
- return {
- };
+ } ).
+ on( 'section-rendered', initTables );
}() );
-
-M.define( 'tables', module );
}( mw.mobileFrontend, jQuery ));
--
To view, visit https://gerrit.wikimedia.org/r/51589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d6c40a965e2ddd6e21b4f79b2d85ad6ab8de6cd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
