Merge branch 'master' into ft/deeplinking-link-component

README.md

@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 5 revisions since initial creation in 20
 
 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
 ------------------ | ------------ | -------------------------- | -----
-3.6.0 | 2017-12-01 | 2.0, 3.0 | [tag v3.5=6.0](https://github.com/swagger-api/swagger-ui/tree/v3.6.0)
+3.6.1 | 2017-12-01 | 2.0, 3.0 | [tag v3.6.1](https://github.com/swagger-api/swagger-ui/tree/v3.6.1)
 3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
 2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
 2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -81,7 +81,7 @@
     "scroll-to-element": "^2.0.0",
     "serialize-error": "2.0.0",
     "shallowequal": "0.2.2",
-    "swagger-client": "^3.4.0",
+    "swagger-client": "^3.4.1",
     "url-parse": "^1.1.8",
     "whatwg-fetch": "0.11.1",
     "worker-loader": "^0.7.1",

src/core/components/errors.jsx

@@ -73,7 +73,7 @@ const ThrownErrorItem = ( { error, jumpToLine } ) => {
           <span style={{ whiteSpace: "pre-line", "maxWidth": "100%" }}>
             { error.get("message") }
           </span>
-          <div>
+          <div style={{ "text-decoration": "underline", "cursor": "pointer" }}>
             { errorLine && jumpToLine ? <a onClick={jumpToLine.bind(null, errorLine)}>Jump to line { errorLine }</a> : null }
           </div>
         </div>

src/core/components/operation.jsx

@@ -32,7 +32,8 @@ export default class Operation extends PureComponent {
   static defaultProps = {
     operation: null,
     response: null,
-    request: null
+    request: null,
+    specPath: []
   }
 
   render() {
@@ -114,10 +115,10 @@ export default class Operation extends PureComponent {
     let onChangeKey = [ path, method ] // Used to add values to _this_ operation ( indexed by path and method )
 
     return (
+        <div className={deprecated ? "opblock opblock-deprecated" : isShown ? `opblock opblock-${method} is-open` : `opblock opblock-${method}`} id={isShownKey.join("-")} >
           <div className={`opblock-summary opblock-summary-${method}`} onClick={toggleShown} >
             {/*TODO: convert this into a component, that can be wrapped
               and pulled in with getComponent */}
-        <div className={deprecated ? "opblock opblock-deprecated" : isShown ? `opblock opblock-${method} is-open` : `opblock opblock-${method}`} id={isShownKey.join("-")} >
               <span className="opblock-summary-method">{method.toUpperCase()}</span>
               <span className={ deprecated ? "opblock-summary-path__deprecated" : "opblock-summary-path" } >
               <DeepLink

src/core/containers/OperationContainer.jsx

@@ -31,6 +31,7 @@ export default class OperationContainer extends PureComponent {
     request: PropTypes.instanceOf(Iterable),
     security: PropTypes.instanceOf(Iterable),
     isDeepLinkingEnabled: PropTypes.bool.isRequired,
+    specPath: PropTypes.array.isRequired,
 
     getComponent: PropTypes.func.isRequired,
     authActions: PropTypes.object,
@@ -141,6 +142,7 @@ export default class OperationContainer extends PureComponent {
       displayOperationId,
       displayRequestDuration,
       isDeepLinkingEnabled,
+      specPath,
       specSelectors,
       specActions,
       getComponent,
@@ -187,6 +189,7 @@ export default class OperationContainer extends PureComponent {
         onTryoutClick={this.onTryoutClick}
         onCancelClick={this.onCancelClick}
         onExecute={this.onExecute}
+        specPath={specPath}
 
         specActions={ specActions }
         specSelectors={ specSelectors }

src/style/_servers.scss

@@ -11,6 +11,7 @@
         select
         {
             min-width: 130px;
+            max-width: 100%;
         }
     }