From 066d1ef940f1341096cd0fc4355e1528b68172c1 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Fri, 29 May 2015 16:06:10 -0700
Subject: [PATCH] registration: Improve ResourceModules schema definition

* "-" is a valid character in module names
* debugScripts, loaderScripts, dependencies, and messages can all be
strings in addition to arrays.

Change-Id: I76570ebf1cb02ca51c5185d4b0c48a553a0e7d2f
---
 docs/extension.schema.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index a2ff64e256..c4d0513df7 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -307,7 +307,7 @@
 			"description": "ResourceLoader modules to register",
 			"additionalProperties": false,
 			"patternProperties": {
-				"^[a-zA-Z0-9\\.]+$": {
+				"^[a-zA-Z0-9-\\.]+$": {
 					"type": "object",
 					"description": "A single ResourceLoader module descriptor",
 					"properties": {
@@ -361,21 +361,21 @@
 							}
 						},
 						"debugScripts": {
-							"type": "array",
+							"type": ["string", "array"],
 							"description": "Scripts to include in debug contexts",
 							"items": {
 								"type": "string"
 							}
 						},
 						"loaderScripts": {
-							"type": "array",
+							"type": ["string", "array"],
 							"description": "Scripts to include in the startup module",
 							"items": {
 								"type": "string"
 							}
 						},
 						"dependencies": {
-							"type": "array",
+							"type": ["string", "array"],
 							"description": "Modules which must be loaded before this module",
 							"items": {
 								"type": "string"
@@ -404,7 +404,7 @@
 							}
 						},
 						"messages": {
-							"type": "array",
+							"type": ["string", "array"],
 							"description": "Messages to always load",
 							"items": {
 								"type": "string"
-- 
2.20.1