From 46f75c2ceebbd63dda521e4c6ef38cd543974acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Tue, 27 Oct 2015 15:45:43 +0100
Subject: [PATCH] Sync resource loader deps in extension.json and Resources.php

Added missing mediawiki.Uri to ext.uls.displaysettings, exposed
by the desync.

Change-Id: I1556ad7488ff76b89c20a8f784dd519e12e29dc4
---
 Resources.php  | 1 +
 extension.json | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Resources.php b/Resources.php
index cad40972..7e34c121 100644
--- a/Resources.php
+++ b/Resources.php
@@ -34,6 +34,7 @@ $wgResourceModules['ext.uls.displaysettings'] = array(
 		'ext.uls.mediawiki',
 		'ext.uls.webfonts',
 		'mediawiki.api.parse',
+		'mediawiki.Uri',
 	),
 ) + $resourcePaths;
 
diff --git a/extension.json b/extension.json
index 6780f110..86e93c0f 100644
--- a/extension.json
+++ b/extension.json
@@ -114,7 +114,8 @@
 				"ext.uls.languagesettings",
 				"ext.uls.mediawiki",
 				"ext.uls.webfonts",
-				"mediawiki.api.parse"
+				"mediawiki.api.parse",
+				"mediawiki.Uri"
 			],
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
@@ -131,7 +132,8 @@
 				"ext.uls.preferences",
 				"ext.uls.mediawiki",
 				"ext.uls.messages",
-				"jquery.ime"
+				"jquery.ime",
+				"mediawiki.notify"
 			],
 			"messages": [
 				"uls-ime-helppage"
@@ -152,7 +154,8 @@
 				"monobook": "css/ext.uls-monobook.css"
 			},
 			"dependencies": [
-				"mediawiki.Uri",
+				"mediawiki.api",
+				"mediawiki.cookie",
 				"jquery.client",
 				"jquery.cookie"
 			],