Merge branch 'master' into bug/1413-import-file-dialog-style-bug

luojinggit · Aug 4, 2017 · bc80603 · bc80603
2 parents fc58d9d + 58029b8
commit bc80603
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 24 deletions.
diff --git a/dist/swagger-editor-bundle.js b/dist/swagger-editor-bundle.js
diff --git a/dist/swagger-editor.js b/dist/swagger-editor.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "swagger-editor",
   "description": "Swagger Editor",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "dist/swagger-editor.js",
   "repository": "[email protected]:swagger-api/swagger-editor.git",
   "license": "Apache-2.0",
@@ -57,7 +57,7 @@
     "react-transition-group": "^1.1.1",
     "redux": "^3.x.x",
     "swagger-client": "3.0.19",
-    "swagger-ui": "3.1.0",
+    "swagger-ui": "3.1.2",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {

diff --git a/src/plugins/validation/structural-validation/oas3-schema.js b/src/plugins/validation/structural-validation/oas3-schema.js
@@ -142,8 +142,7 @@ export default {
       ],
       "properties": {
         "url": {
-          "type": "string",
-          "format": "uri-reference"
+          "type": "string"
         },
         "description": {
           "type": "string"
@@ -168,7 +167,10 @@ export default {
       ],
       "properties": {
         "enum": {
-          "type": "string"
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         },
         "default": {
           "type": "string"
@@ -464,17 +466,14 @@ export default {
           }
         },
         "items": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/Schema"
-              },
-              {
-                "$ref": "#/definitions/Reference"
-              }
-            ]
-          }
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Schema"
+            },
+            {
+              "$ref": "#/definitions/Reference"
+            }
+          ]
         },
         "properties": {
           "type": "object",
@@ -1041,7 +1040,14 @@ export default {
         "callbacks": {
           "type": "object",
           "additionalProperties": {
-            "$ref": "#/definitions/Callback"
+            "oneOf": [
+              {
+                "$ref": "#/definitions/Callback"
+              },
+              {
+                "$ref": "#/definitions/Reference"
+              }
+            ]
           }
         },
         "deprecated": {
@@ -2087,7 +2093,7 @@ export default {
       "type": "object",
       "required": [
         "type",
-        "openIdConnect"
+        "openIdConnectUrl"
       ],
       "properties": {
         "type": {
@@ -2311,7 +2317,9 @@ export default {
     },
     "Callback": {
       "type": "object",
-      "additionalProperties": false,
+      "additionalProperties": {
+        "$ref": "#/definitions/PathItem"
+      },
       "patternProperties": {
         "^x-": {
         }

diff --git a/src/standalone/topbar/topbar.jsx b/src/standalone/topbar/topbar.jsx
@@ -63,7 +63,7 @@ export default class Topbar extends React.Component {
 
     fileReader.onload = fileLoadedEvent => {
       let textFromFileLoaded = fileLoadedEvent.target.result
-      this.props.specActions.updateSpec(textFromFileLoaded)
+      this.props.specActions.updateSpec(YAML.safeDump(YAML.safeLoad(textFromFileLoaded)))
       this.hideModal()
     }