From 3f83f2eb368db1d3fb8f65487b189e948d578289 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 19 Mar 2019 19:48:39 +0000
Subject: [PATCH] Merge 'ext.echo.controller' module into 'ext.echo.ui'

This is not used anywhere else and doesn't appear to be something
that is intended to be usable or loadable as its own entry point.

The name 'ext.echo.ui' could be improved to better reflect the
bundle purpose it represents, but thats a breaking change for a
separate commit at the discretion of the maintainers' preferences.

Change-Id: If9cf287917a51de96a36d534b7c0cfadf1accf9a
---
 extension.json | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/extension.json b/extension.json
index 97b979961..3ecb86715 100644
--- a/extension.json
+++ b/extension.json
@@ -91,6 +91,7 @@
 		},
 		"ext.echo.ui": {
 			"scripts": [
+				"controller/mw.echo.Controller.js",
 				"ui/mw.echo.ui.js",
 				"ui/mw.echo.ui.SortedListWidget.js",
 				"ui/mw.echo.ui.SubGroupListWidget.js",
@@ -137,10 +138,12 @@
 				]
 			},
 			"dependencies": [
+				"ext.echo.api",
+				"ext.echo.dm",
 				"ext.echo.logger",
 				"ext.echo.styles.notifications",
-				"ext.echo.controller",
 				"ext.echo.secondaryicons",
+				"oojs",
 				"oojs-ui-core",
 				"oojs-ui-widgets",
 				"moment",
@@ -256,20 +259,6 @@
 				"mobile"
 			]
 		},
-		"ext.echo.controller": {
-			"scripts": [
-				"controller/mw.echo.Controller.js"
-			],
-			"dependencies": [
-				"oojs",
-				"ext.echo.api",
-				"ext.echo.dm"
-			],
-			"targets": [
-				"desktop",
-				"mobile"
-			]
-		},
 		"ext.echo.base": {
 			"targets": [
 				"desktop",