Merge "Stop using deprecated jquery.json module"

This commit is contained in:
jenkins-bot
2014-07-14 03:30:37 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -71,7 +71,6 @@ $wgResourceModules['ext.uls.init'] = array(
'dependencies' => array( 'dependencies' => array(
'mediawiki.Uri', 'mediawiki.Uri',
'jquery.client', 'jquery.client',
'jquery.json',
'jquery.cookie', 'jquery.cookie',
), ),
'position' => 'top', 'position' => 'top',

View File

@@ -104,7 +104,7 @@
mw.uls.setPreviousLanguages = function ( previousLanguages ) { mw.uls.setPreviousLanguages = function ( previousLanguages ) {
$.cookie( mw.uls.previousLanguagesCookie, $.cookie( mw.uls.previousLanguagesCookie,
$.toJSON( previousLanguages ), { JSON.stringify( previousLanguages ), {
path: '/' path: '/'
} }
); );
@@ -118,7 +118,7 @@
} }
// return last 5 language changes // return last 5 language changes
return $.parseJSON( previousLanguages ).slice( -5 ); return JSON.parse( previousLanguages ).slice( -5 );
}; };
/** /**