From 1d9fec680b7b754ff9f76436eae7ed1c0ae81fcb Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Mon, 1 May 2017 14:05:19 -0700
Subject: [PATCH] extension.json: Remove no-op dependency on deprecated
 es5-shim module

Preserve dependency for MediaWiki 1.27 and 1.28.

Bug: T162590
Change-Id: Ia77b8914e3b036b6d7d7bf886ba0e47be9aba0ed
---
 UniversalLanguageSelector.hooks.php | 48 ++++++++++++++++++++---------
 extension.json                      | 17 ----------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 0967a210..460d929c 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -468,22 +468,42 @@ class UniversalLanguageSelectorHooks {
 	 * @return boolean true
 	 */
 	public static function onResourceLoaderRegisterModules( ResourceLoader $resourceLoader ) {
-		global $wgULSEventLogging;
+		global $wgULSEventLogging, $wgVersion;
 
-		if ( $wgULSEventLogging ) {
-			$resourceLoader->register( [
-				'ext.uls.eventlogger' => [
-					'scripts' => 'js/ext.uls.eventlogger.js',
-					'dependencies' => [
-						'mediawiki.user',
-						'schema.UniversalLanguageSelector',
-					],
-					'localBasePath' => __DIR__ . '/resources',
-					'remoteExtPath' => 'UniversalLanguageSelector/resources',
-				],
-			] );
+		$modules = [];
+		$modules['ext.uls.compactlinks'] = [
+			'scripts' => 'js/ext.uls.compactlinks.js',
+			'styles' => 'css/ext.uls.compactlinks.less',
+			'dependencies' => [
+				'mediawiki.jqueryMsg',
+				'mediawiki.language',
+				'mediawiki.ui.button',
+				'ext.uls.init'
+			],
+			'messages' => [
+				'ext-uls-compact-link-count',
+				'ext-uls-compact-link-info'
+			],
+			'localBasePath' => __DIR__ . '/resources',
+			'remoteExtPath' => 'UniversalLanguageSelector/resources'
+		];
+		if ( version_compare( $wgVersion, '1.29', '<' ) ) {
+			// Support: MediaWiki 1.28 and earlier (T162590)
+			$modules['ext.uls.compactlinks']['dependencies'][] = 'es5-shim';
 		}
 
-		return true;
+		if ( $wgULSEventLogging ) {
+			$modules['ext.uls.eventlogger'] = [
+				'scripts' => 'js/ext.uls.eventlogger.js',
+				'dependencies' => [
+					'mediawiki.user',
+					'schema.UniversalLanguageSelector',
+				],
+				'localBasePath' => __DIR__ . '/resources',
+				'remoteExtPath' => 'UniversalLanguageSelector/resources',
+			];
+		}
+
+		$resourceLoader->register( $modules );
 	}
 }
diff --git a/extension.json b/extension.json
index 9c7dbfe0..aa4cb660 100644
--- a/extension.json
+++ b/extension.json
@@ -237,23 +237,6 @@
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
-		"ext.uls.compactlinks": {
-			"scripts": "js/ext.uls.compactlinks.js",
-			"styles": "css/ext.uls.compactlinks.less",
-			"dependencies": [
-				"es5-shim",
-				"mediawiki.jqueryMsg",
-				"mediawiki.language",
-				"mediawiki.ui.button",
-				"ext.uls.init"
-			],
-			"messages": [
-				"ext-uls-compact-link-count",
-				"ext-uls-compact-link-info"
-			],
-			"localBasePath": "resources",
-			"remoteExtPath": "UniversalLanguageSelector/resources"
-		},
 		"ext.uls.webfonts": {
 			"scripts": "js/ext.uls.webfonts.js",
 			"dependencies": [