From bc2877449cce746f108ac08e9473a5836cd2e2dc Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Thu, 23 Aug 2012 15:55:12 +0530 Subject: [PATCH] MediaWiki override for ULS defaults. Change-Id: Ia64c51b988e3b1bbd3bb9cabac53fdc1069609db --- resources/js/ext.uls.displaysettings.js | 2 -- resources/js/ext.uls.init.js | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 302b0b04..1dcd8c7b 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -151,8 +151,6 @@ $moreLanguagesButton.uls( { left: that.$parent.left, top: that.$parent.top, - languages: mw.config.get( 'wgULSLanguages' ), - searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch", onReady: function( uls ) { var $back = $( '' ) .prop( 'href', '#' ) diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js index e37bae18..6e72b345 100644 --- a/resources/js/ext.uls.init.js +++ b/resources/js/ext.uls.init.js @@ -20,6 +20,12 @@ ( function( $, mw ) { "use strict"; + // MediaWiki override for ULS defaults. + $.fn.uls.defaults = $.extend( $.fn.uls.defaults, { + languages: mw.config.get( 'wgULSLanguages' ), + searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch" + } ); + $( document ).ready( function() { var $ulsTrigger = $( '.uls-trigger' ), previousLang = $.cookie( 'uls-previous-language' ), @@ -72,9 +78,7 @@ }, onSelect: function( language ) { changeLanguage( language ); - }, - languages: mw.config.get( 'wgULSLanguages' ), - searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch" + } } ); if ( !previousLang || previousLang === currentLang ) {