Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58400
Change subject: Deprecate M.utils
......................................................................
Deprecate M.utils
With rewrite of search and jQuery-ification of toggle this is now
surplus to requirements with this change
Change-Id: I71ac0dc41dedbd654bbe1d7d6f98844b0c65bd37
---
M javascripts/common/mf-application.js
M javascripts/common/mf-navigation.js
M javascripts/specials/mobileoptions.js
3 files changed, 14 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/58400/1
diff --git a/javascripts/common/mf-application.js
b/javascripts/common/mf-application.js
index bbc6cab..3275f56 100644
--- a/javascripts/common/mf-application.js
+++ b/javascripts/common/mf-application.js
@@ -218,7 +218,6 @@
supportsPositionFixed: supportsPositionFixed,
triggerPageReadyHook: triggerPageReadyHook,
prettyEncodeTitle: prettyEncodeTitle,
- utils: $, // FIXME: deprecate
template: template
} );
diff --git a/javascripts/common/mf-navigation.js
b/javascripts/common/mf-navigation.js
index 1d6688f..4172e99 100644
--- a/javascripts/common/mf-navigation.js
+++ b/javascripts/common/mf-navigation.js
@@ -3,7 +3,7 @@
var m = ( function( $ ) {
var View = M.require( 'view' ),
menu,
- u = M.utils, mfePrefix = M.prefix,
+ mfePrefix = M.prefix,
inBeta = mw.config.get( 'wgMFMode' ) === 'beta',
Overlay,
Drawer, CtaDrawer;
@@ -168,13 +168,13 @@
if( window.location.hash === '#mw-mf-page-left' ) {
openNavigation();
- u( document.body ).addClass( 'noTransitions' );
+ $( 'body' ).addClass( 'noTransitions' );
window.setTimeout( function() {
- u( document.body ).removeClass( 'noTransitions'
);
+ $( 'body' ).removeClass( 'noTransitions' );
}, 1000 );
}
- u( search ).bind( 'focus', function() {
+ $( search ).bind( 'focus', function() {
if ( !inBeta || $( window ).width() < 700 ) {
closeNavigation();
}
diff --git a/javascripts/specials/mobileoptions.js
b/javascripts/specials/mobileoptions.js
index 2172059..d5b7f61 100644
--- a/javascripts/specials/mobileoptions.js
+++ b/javascripts/specials/mobileoptions.js
@@ -1,33 +1,32 @@
-( function( M ) {
+( function( M, $ ) {
var m = ( function() {
function enhanceCheckboxes() {
- var inputs = document.getElementsByTagName( 'input' ), i, el,
special,
- u = M.utils;
+ var inputs = document.getElementsByTagName( 'input' ), i, el,
special;
- u( document.body ).addClass( 'mw-mf-checkboxes' );
+ $( 'body' ).addClass( 'mw-mf-checkboxes' );
function clickChkBox() {
var parent = this,
box = parent.getElementsByTagName( 'input' )[ 0
];
- if( !u( parent ).hasClass( 'checked' ) ) {
- u( parent ).addClass( 'checked' );
+ if( !$( parent ).hasClass( 'checked' ) ) {
+ $( parent ).addClass( 'checked' );
box.checked = true;
} else {
- u( parent ).removeClass( 'checked' );
+ $( parent ).removeClass( 'checked' );
box.checked = false;
}
}
for( i = 0; i < inputs.length; i++ ) {
el = inputs[i];
- special = u( el.parentNode ).hasClass(
'mw-mf-checkbox-css3' );
+ special = $( el.parentNode ).hasClass(
'mw-mf-checkbox-css3' );
if( el.getAttribute( 'type' ) === 'checkbox' && special
) {
- u( el.parentNode ).bind( 'click', clickChkBox );
+ $( el.parentNode ).on( 'click', clickChkBox );
if( el.checked ) {
- u( el.parentNode ).addClass( 'checked
');
+ $( el.parentNode ).addClass( 'checked
');
}
}
}
@@ -44,4 +43,4 @@
M.define( 'mobileoptions', m );
-}( mw.mobileFrontend ) );
+}( mw.mobileFrontend, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/58400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71ac0dc41dedbd654bbe1d7d6f98844b0c65bd37
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
