From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- resources/Resources.php | 229 ++++++++++++++++++++++++++++-------------------- 1 file changed, 135 insertions(+), 94 deletions(-) (limited to 'resources/Resources.php') diff --git a/resources/Resources.php b/resources/Resources.php index ab2610ce..0a70c5a2 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -4,15 +4,25 @@ return array( /* Special modules who have their own classes */ + // Scripts managed by the local wiki (stored in the MediaWiki namespace) 'site' => array( 'class' => 'ResourceLoaderSiteModule' ), 'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ), 'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ), - 'user' => array( 'class' => 'ResourceLoaderUserModule' ), + 'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ), 'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ), - 'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ), + + // Scripts managed by the current user (stored in their user space) + 'user' => array( 'class' => 'ResourceLoaderUserModule' ), + + // Scripts generated based on the current user's preferences 'user.cssprefs' => array( 'class' => 'ResourceLoaderUserCSSPrefsModule' ), + + // Populate mediawiki.user placeholders with information about the current user + 'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ), 'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ), - 'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ), + + // Scripts for the dynamic language specific data, like grammar forms. + 'mediawiki.language.data' => array( 'class' => 'ResourceLoaderLanguageDataModule' ), /* Skins */ @@ -68,7 +78,7 @@ return array( 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), 'skins.standard' => array( - 'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ), + 'styles' => array( 'standard/main.css' => array( 'media' => 'screen' ) ), 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), @@ -79,6 +89,7 @@ return array( 'common/commonContent.css' => array( 'media' => 'screen' ), 'common/commonInterface.css' => array( 'media' => 'screen' ), 'vector/screen.css' => array( 'media' => 'screen' ), + 'vector/screen-hd.css' => array( 'media' => 'screen and (min-width: 982px)' ), ), 'scripts' => 'vector/vector.js', 'remoteBasePath' => $GLOBALS['wgStylePath'], @@ -108,6 +119,10 @@ return array( 'scripts' => 'resources/jquery/jquery.autoEllipsis.js', 'dependencies' => 'jquery.highlightText', ), + 'jquery.badge' => array( + 'scripts' => 'resources/jquery/jquery.badge.js', + 'styles' => 'resources/jquery/jquery.badge.css', + ), 'jquery.byteLength' => array( 'scripts' => 'resources/jquery/jquery.byteLength.js', ), @@ -158,6 +173,7 @@ return array( ), 'jquery.highlightText' => array( 'scripts' => 'resources/jquery/jquery.highlightText.js', + 'dependencies' => 'jquery.mwExtension', ), 'jquery.hoverIntent' => array( 'scripts' => 'resources/jquery/jquery.hoverIntent.js', @@ -173,10 +189,6 @@ return array( 'styles' => 'resources/jquery/jquery.makeCollapsible.css', 'messages' => array( 'collapsible-expand', 'collapsible-collapse' ), ), - 'jquery.messageBox' => array( - 'scripts' => 'resources/jquery/jquery.messageBox.js', - 'styles' => 'resources/jquery/jquery.messageBox.css', - ), 'jquery.mockjax' => array( 'scripts' => 'resources/jquery/jquery.mockjax.js', ), @@ -202,6 +214,10 @@ return array( 'scripts' => 'resources/jquery/jquery.spinner.js', 'styles' => 'resources/jquery/jquery.spinner.css', ), + 'jquery.jStorage' => array( + 'scripts' => 'resources/jquery/jquery.jStorage.js', + 'dependencies' => 'jquery.json', + ), 'jquery.suggestions' => array( 'scripts' => 'resources/jquery/jquery.suggestions.js', 'styles' => 'resources/jquery/jquery.suggestions.css', @@ -214,9 +230,11 @@ return array( 'scripts' => 'resources/jquery/jquery.tablesorter.js', 'styles' => 'resources/jquery/jquery.tablesorter.css', 'messages' => array( 'sort-descending', 'sort-ascending' ), + 'dependencies' => 'jquery.mwExtension', ), 'jquery.textSelection' => array( 'scripts' => 'resources/jquery/jquery.textSelection.js', + 'dependencies' => 'jquery.client', ), 'jquery.validate' => array( 'scripts' => 'resources/jquery/jquery.validate.js', @@ -353,10 +371,10 @@ return array( 'fa' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fa.js', 'fi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fi.js', 'fo' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fo.js', - 'fr-ch' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fr-CH.js', 'fr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-fr.js', 'gl' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-gl.js', 'he' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-he.js', + 'hi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hi.js', 'hr' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hr.js', 'hu' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hu.js', 'hy' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-hy.js', @@ -364,7 +382,9 @@ return array( 'is' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-is.js', 'it' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-it.js', 'ja' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ja.js', + 'ka' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ka.js', 'kk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-kk.js', + 'km' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-km.js', 'ko' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-ko.js', 'lb' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lb.js', 'lt' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-lt.js', @@ -524,34 +544,37 @@ return array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.js', 'dependencies' => 'mediawiki.util', ), - 'mediawiki.api.category' => array( + 'mediawiki.api.category' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js', - 'dependencies' => array( + 'dependencies' => array( 'mediawiki.api', - 'mediawiki.Title' + 'mediawiki.Title', ), ), - 'mediawiki.api.edit' => array( + 'mediawiki.api.edit' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.edit.js', - 'dependencies' => array( + 'dependencies' => array( 'mediawiki.api', - 'mediawiki.Title' + 'mediawiki.Title', ), ), - 'mediawiki.api.parse' => array( + 'mediawiki.api.parse' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.parse.js', 'dependencies' => 'mediawiki.api', ), - 'mediawiki.api.titleblacklist' => array( + 'mediawiki.api.titleblacklist' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.titleblacklist.js', - 'dependencies' => array( + 'dependencies' => array( 'mediawiki.api', - 'mediawiki.Title' + 'mediawiki.Title', ), ), - 'mediawiki.api.watch' => array( + 'mediawiki.api.watch' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.watch.js', - 'dependencies' => array('mediawiki.api', 'mediawiki.user'), + 'dependencies' => array( + 'mediawiki.api', + 'user.tokens', + ), ), 'mediawiki.debug' => array( 'scripts' => 'resources/mediawiki/mediawiki.debug.js', @@ -569,13 +592,13 @@ return array( 'mediawiki.feedback' => array( 'scripts' => 'resources/mediawiki/mediawiki.feedback.js', 'styles' => 'resources/mediawiki/mediawiki.feedback.css', - 'dependencies' => array( - 'mediawiki.api.edit', + 'dependencies' => array( + 'mediawiki.api.edit', 'mediawiki.Title', 'mediawiki.jqueryMsg', 'jquery.ui.dialog', ), - 'messages' => array( + 'messages' => array( 'feedback-bugornote', 'feedback-subject', 'feedback-message', @@ -594,6 +617,29 @@ return array( 'mediawiki.htmlform' => array( 'scripts' => 'resources/mediawiki/mediawiki.htmlform.js', ), + 'mediawiki.notification' => array( + 'styles' => 'resources/mediawiki/mediawiki.notification.css', + 'scripts' => 'resources/mediawiki/mediawiki.notification.js', + 'dependencies' => array( + 'mediawiki.page.startup', + ), + ), + 'mediawiki.notify' => array( + 'scripts' => 'resources/mediawiki/mediawiki.notify.js', + ), + 'mediawiki.searchSuggest' => array( + 'scripts' => 'resources/mediawiki/mediawiki.searchSuggest.js', + 'messages' => array( + 'searchsuggest-search', + 'searchsuggest-containing', + ), + 'dependencies' => array( + 'jquery.autoEllipsis', + 'jquery.client', + 'jquery.placeholder', + 'jquery.suggestions', + ), + ), 'mediawiki.Title' => array( 'scripts' => 'resources/mediawiki/mediawiki.Title.js', 'dependencies' => 'mediawiki.util', @@ -605,6 +651,7 @@ return array( 'scripts' => 'resources/mediawiki/mediawiki.user.js', 'dependencies' => array( 'jquery.cookie', + 'mediawiki.api', ), ), 'mediawiki.util' => array( @@ -612,8 +659,8 @@ return array( 'dependencies' => array( 'jquery.client', 'jquery.cookie', - 'jquery.messageBox', 'jquery.mwExtension', + 'mediawiki.notify', ), 'messages' => array( 'showtoc', 'hidetoc' ), 'position' => 'top', // For $wgPreloadJavaScriptMwUtil @@ -627,10 +674,17 @@ return array( 'jquery.textSelection', 'jquery.byteLimit', ), + 'position' => 'top', + ), + 'mediawiki.action.edit.preview' => array( + 'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js', + 'dependencies' => array( + 'jquery.form', + 'jquery.spinner', + ), ), 'mediawiki.action.history' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js', - 'dependencies' => 'jquery.ui.button', 'group' => 'mediawiki.action.history', ), 'mediawiki.action.history.diff' => array( @@ -651,21 +705,9 @@ return array( 'mediawiki.action.view.rightClickEdit' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js', ), + // Alias for backwards compatibility 'mediawiki.action.watch.ajax' => array( - 'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js', - 'dependencies' => array( - 'mediawiki.api.watch', - 'mediawiki.util', - ), - 'messages' => array( - 'watch', - 'unwatch', - 'watching', - 'unwatching', - 'tooltip-ca-watch', - 'tooltip-ca-unwatch', - 'watcherrortext', - ), + 'dependencies' => 'mediawiki.page.watch.ajax' ), /* MediaWiki Language */ @@ -673,59 +715,47 @@ return array( 'mediawiki.language' => array( 'scripts' => 'resources/mediawiki.language/mediawiki.language.js', 'languageScripts' => array( - 'am' => 'resources/mediawiki.language/languages/am.js', - 'ar' => 'resources/mediawiki.language/languages/ar.js', - 'bat-smg' => 'resources/mediawiki.language/languages/bat-smg.js', - 'be' => 'resources/mediawiki.language/languages/be.js', - 'be-tarask' => 'resources/mediawiki.language/languages/be-tarask.js', - 'bh' => 'resources/mediawiki.language/languages/bh.js', 'bs' => 'resources/mediawiki.language/languages/bs.js', - 'cs' => 'resources/mediawiki.language/languages/cs.js', - 'cu' => 'resources/mediawiki.language/languages/cu.js', - 'cy' => 'resources/mediawiki.language/languages/cy.js', 'dsb' => 'resources/mediawiki.language/languages/dsb.js', - 'fr' => 'resources/mediawiki.language/languages/fr.js', + 'fi' => 'resources/mediawiki.language/languages/fi.js', 'ga' => 'resources/mediawiki.language/languages/ga.js', - 'gd' => 'resources/mediawiki.language/languages/gd.js', - 'gv' => 'resources/mediawiki.language/languages/gv.js', 'he' => 'resources/mediawiki.language/languages/he.js', - 'hi' => 'resources/mediawiki.language/languages/hi.js', - 'hr' => 'resources/mediawiki.language/languages/hr.js', 'hsb' => 'resources/mediawiki.language/languages/hsb.js', + 'hu' => 'resources/mediawiki.language/languages/hu.js', 'hy' => 'resources/mediawiki.language/languages/hy.js', - 'ksh' => 'resources/mediawiki.language/languages/ksh.js', - 'ln' => 'resources/mediawiki.language/languages/ln.js', - 'lt' => 'resources/mediawiki.language/languages/lt.js', - 'lv' => 'resources/mediawiki.language/languages/lv.js', - 'mg' => 'resources/mediawiki.language/languages/mg.js', - 'mk' => 'resources/mediawiki.language/languages/mk.js', - 'mo' => 'resources/mediawiki.language/languages/mo.js', - 'mt' => 'resources/mediawiki.language/languages/mt.js', - 'nl' => 'resources/mediawiki.language/languages/nl.js', - 'nso' => 'resources/mediawiki.language/languages/nso.js', - 'pl' => 'resources/mediawiki.language/languages/pl.js', - 'pt' => 'resources/mediawiki.language/languages/pt.js', - 'pt-br' => 'resources/mediawiki.language/languages/pt-br.js', - 'ro' => 'resources/mediawiki.language/languages/ro.js', + 'la' => 'resources/mediawiki.language/languages/la.js', + 'os' => 'resources/mediawiki.language/languages/os.js', 'ru' => 'resources/mediawiki.language/languages/ru.js', - 'se' => 'resources/mediawiki.language/languages/se.js', - 'sh' => 'resources/mediawiki.language/languages/sh.js', - 'sk' => 'resources/mediawiki.language/languages/sk.js', 'sl' => 'resources/mediawiki.language/languages/sl.js', - 'sma' => 'resources/mediawiki.language/languages/sma.js', - 'sr-ec' => 'resources/mediawiki.language/languages/sr-ec.js', - 'sr-el' => 'resources/mediawiki.language/languages/sr-el.js', - 'sr' => 'resources/mediawiki.language/languages/sr.js', - 'ti' => 'resources/mediawiki.language/languages/ti.js', - 'tl' => 'resources/mediawiki.language/languages/tl.js', 'uk' => 'resources/mediawiki.language/languages/uk.js', - 'wa' => 'resources/mediawiki.language/languages/wa.js', ), + 'dependencies' => array( + 'mediawiki.language.data', + 'mediawiki.cldr' + ), + ), + + 'mediawiki.cldr' => array( + 'scripts' => 'resources/mediawiki.language/mediawiki.cldr.js', + 'dependencies' => array( + 'mediawiki.libs.pluralruleparser', + ), + ), + + 'mediawiki.libs.pluralruleparser' => array( + 'scripts' => 'resources/mediawiki.libs/CLDRPluralRuleParser.js', + ), + + 'mediawiki.language.init' => array( + 'scripts' => 'resources/mediawiki.language/mediawiki.language.init.js', ), 'mediawiki.jqueryMsg' => array( - 'dependencies' => array( 'mediawiki.language', 'mediawiki.util' ), - 'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js' + 'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js', + 'dependencies' => array( + 'mediawiki.util', + 'mediawiki.language', + ), ), /* MediaWiki Libs */ @@ -754,7 +784,25 @@ return array( ), 'position' => 'top', ), - + 'mediawiki.page.watch.ajax' => array( + 'scripts' => 'resources/mediawiki.page/mediawiki.page.watch.ajax.js', + 'dependencies' => array( + 'mediawiki.page.startup', + 'mediawiki.api.watch', + 'mediawiki.util', + 'mediawiki.notify', + 'jquery.mwExtension', + ), + 'messages' => array( + 'watch', + 'unwatch', + 'watching', + 'unwatching', + 'tooltip-ca-watch', + 'tooltip-ca-unwatch', + 'watcherrortext', + ), + ), /* MediaWiki Special pages */ @@ -789,6 +837,7 @@ return array( ), 'mediawiki.special.preferences' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js', + 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css', ), 'mediawiki.special.recentchanges' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js', @@ -798,6 +847,11 @@ return array( 'mediawiki.special.search' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js', 'styles' => 'resources/mediawiki.special/mediawiki.special.search.css', + 'messages' => array( + 'powersearch-togglelabel', + 'powersearch-toggleall', + 'powersearch-togglenone', + ), ), 'mediawiki.special.undelete' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js', @@ -868,19 +922,6 @@ return array( 'localBasePath' => $GLOBALS['wgStyleDirectory'], 'dependencies' => 'mediawiki.legacy.wikibits', ), - 'mediawiki.legacy.mwsuggest' => array( - 'scripts' => 'common/mwsuggest.js', - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - 'dependencies' => 'mediawiki.legacy.wikibits', - 'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ), - ), - 'mediawiki.legacy.preview' => array( - 'scripts' => 'common/preview.js', - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - 'dependencies' => 'mediawiki.legacy.wikibits', - ), 'mediawiki.legacy.protect' => array( 'scripts' => 'common/protect.js', 'remoteBasePath' => $GLOBALS['wgStylePath'], -- cgit v1.2.2