Merge pull request #2817 from bodnia/fix-2796

#2796 disable validator (with badge) by removing it from config
swagger-api · Mar 29, 2017 · c38bf2a · c38bf2a
2 parents 374b361 + ded299d
commit c38bf2a
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 60 deletions.
diff --git a/dist/swagger-ui-bundle.js b/dist/swagger-ui-bundle.js
diff --git a/dist/swagger-ui-bundle.js.map b/dist/swagger-ui-bundle.js.map
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
diff --git a/dist/swagger-ui.js.map b/dist/swagger-ui.js.map
diff --git a/src/core/components/online-validator-badge.jsx b/src/core/components/online-validator-badge.jsx
@@ -13,7 +13,7 @@ export default class OnlineValidatorBadge extends React.Component {
         let { validatorUrl } = getConfigs()
         this.state = {
             url: specSelectors.url(),
-            validatorUrl: validatorUrl || "https://online.swagger.io/validator"
+            validatorUrl: validatorUrl === undefined ? "https://online.swagger.io/validator" : null
         }
     }
 
@@ -23,7 +23,7 @@ export default class OnlineValidatorBadge extends React.Component {
 
         this.setState({
             url: specSelectors.url(),
-            validatorUrl: validatorUrl || "https://online.swagger.io/validator"
+            validatorUrl: validatorUrl === undefined ? "https://online.swagger.io/validator" : null
         })
     }
 
@@ -33,7 +33,7 @@ export default class OnlineValidatorBadge extends React.Component {
 
         if ( typeof spec === "object" && Object.keys(spec).length) return null
 
-        if (!this.state.url) {
+        if (!this.state.url || !this.state.validatorUrl) {
           return null
         }
 

diff --git a/src/core/index.js b/src/core/index.js
@@ -14,8 +14,8 @@ module.exports = function SwaggerUI(opts) {
     spec: {},
     url: "",
     layout: "Layout",
+    validatorUrl: "https://online.swagger.io/validator",
     configs: {
-      validatorUrl: "https://online.swagger.io/validator"
     },
 
     // Initial set of plugins ( TODO rename this, or refactor - we don't need presets _and_ plugins. Its just there for performance.