Merge pull request #436 from handrews/draft-04

handrews · web-flow · commit dba92b702c94 · 2017-10-15T12:42:34.000-07:00
Bugfixes for draft-04 meta-schemas
diff --git a/hyper-schema.json b/hyper-schema.json
@@ -116,6 +116,11 @@
                     "$ref": "#"
                 }
             }
+        },
+        "readOnly": {
+            "description": "If true, indicates that the value of this property is controlled by the server.",
+            "type": "boolean",
+            "default": false
         }
     },
     "links": [
diff --git a/links.json b/links.json
@@ -38,4 +38,4 @@
 	"dependencies" : {
 		"enctype" : "method"
 	}
-}
+}
diff --git a/schema.json b/schema.json
@@ -28,12 +28,10 @@
     "type": "object",
     "properties": {
         "id": {
-            "type": "string",
-            "format": "uri"
+            "type": "string"
         },
         "$schema": {
-            "type": "string",
-            "format": "uri"
+            "type": "string"
         },
         "title": {
             "type": "string"
@@ -137,6 +135,7 @@
                 }
             ]
         },
+        "format": { "type": "string" },
         "allOf": { "$ref": "#/definitions/schemaArray" },
         "anyOf": { "$ref": "#/definitions/schemaArray" },
         "oneOf": { "$ref": "#/definitions/schemaArray" },

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,11 @@`
`116`	`116`	`"$ref": "#"`
`117`	`117`	`}`
`118`	`118`	`}`
	`119`	`+ },`
	`120`	`+ "readOnly": {`
	`121`	`+ "description": "If true, indicates that the value of this property is controlled by the server.",`
	`122`	`+ "type": "boolean",`
	`123`	`+ "default": false`
`119`	`124`	`}`
`120`	`125`	`},`
`121`	`126`	`"links": [`