From 3544136ab15105f5af368384abc6ef0170701067 Mon Sep 17 00:00:00 2001
From: Josh Ponelat <josh@ponelat.com>
Date: Fri, 15 May 2015 09:10:03 +0200
Subject: [PATCH] dynamic-html: make sure clicking on return type works

---
 .../resources/swagger-static/assets/js/main.js   | 13 ++++---------
 .../resources/swagger-static/operation.mustache  |  2 +-
 samples/dynamic-html/docs/assets/js/main.js      | 13 ++++---------
 samples/dynamic-html/docs/operations/PetApi.html | 16 ++++++++--------
 .../dynamic-html/docs/operations/StoreApi.html   |  8 ++++----
 .../dynamic-html/docs/operations/UserApi.html    | 16 ++++++++--------
 6 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js
index 660d628567c..ee0d2f92470 100644
--- a/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js
+++ b/modules/swagger-codegen/src/main/resources/swagger-static/assets/js/main.js
@@ -1,13 +1,8 @@
-function main() {}
-
 window.onhashchange = function() {
   choose(window.location.href.toString());
 }
 
-var url = 'http://motyar.blogspot.com/search?q={term}', selectionImage;
-
-function showModel(e, model) {
-}
+var selectionImage;
 
 function choose(url) {
   var f = url.split("/").slice(-1)[0].split("?")[0];
@@ -20,8 +15,8 @@ function choose(url) {
     // rebind the models
     $(".model a").on("click", function(e){
       e.preventDefault();
-      var model = $(this).parent().attr("id")
-      var parentOffset = $(this).parent().offset(); 
+      var model = $(this).parent().attr("data-model")
+      var parentOffset = $(this).parent().offset();
       var encodedWord = encodeURI(model);
 
       if(!selectionImage) {
@@ -33,7 +28,7 @@ function choose(url) {
         $('div.model-container').append(selectionImage);
       }
 
-      selectionImage.load("/models/" + encodedWord + ".html")
+      selectionImage.load("models/" + encodedWord + ".html")
       selectionImage.attr('href',url.replace('{term}',encodeURI(model))).css({
         left: e.pageX + 20,
         top:  e.pageY - 10,
diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache
index d0e35f1b296..e84542d1b72 100644
--- a/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache
+++ b/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache
@@ -13,7 +13,7 @@
   <h3 class="section">HTTP Method</h3>
   <code>{{httpMethod}}</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="{{returnBaseType}}"><a href="#">{{returnType}}</a></div>
+  <div class="model" data-model="{{returnBaseType}}"><a href="">{{returnType}}</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	{{#allParams}}
diff --git a/samples/dynamic-html/docs/assets/js/main.js b/samples/dynamic-html/docs/assets/js/main.js
index 660d628567c..ee0d2f92470 100644
--- a/samples/dynamic-html/docs/assets/js/main.js
+++ b/samples/dynamic-html/docs/assets/js/main.js
@@ -1,13 +1,8 @@
-function main() {}
-
 window.onhashchange = function() {
   choose(window.location.href.toString());
 }
 
-var url = 'http://motyar.blogspot.com/search?q={term}', selectionImage;
-
-function showModel(e, model) {
-}
+var selectionImage;
 
 function choose(url) {
   var f = url.split("/").slice(-1)[0].split("?")[0];
@@ -20,8 +15,8 @@ function choose(url) {
     // rebind the models
     $(".model a").on("click", function(e){
       e.preventDefault();
-      var model = $(this).parent().attr("id")
-      var parentOffset = $(this).parent().offset(); 
+      var model = $(this).parent().attr("data-model")
+      var parentOffset = $(this).parent().offset();
       var encodedWord = encodeURI(model);
 
       if(!selectionImage) {
@@ -33,7 +28,7 @@ function choose(url) {
         $('div.model-container').append(selectionImage);
       }
 
-      selectionImage.load("/models/" + encodedWord + ".html")
+      selectionImage.load("models/" + encodedWord + ".html")
       selectionImage.attr('href',url.replace('{term}',encodeURI(model))).css({
         left: e.pageX + 20,
         top:  e.pageY - 10,
diff --git a/samples/dynamic-html/docs/operations/PetApi.html b/samples/dynamic-html/docs/operations/PetApi.html
index 11ca041d8d8..f14f68db0ca 100644
--- a/samples/dynamic-html/docs/operations/PetApi.html
+++ b/samples/dynamic-html/docs/operations/PetApi.html
@@ -13,7 +13,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>PUT</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -36,7 +36,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -59,7 +59,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="Pet"><a href="#">List</a></div>
+  <div class="model" data-model="Pet"><a href="">List</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -82,7 +82,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="Pet"><a href="#">List</a></div>
+  <div class="model" data-model="Pet"><a href="">List</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -105,7 +105,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="Pet"><a href="#">Pet</a></div>
+  <div class="model" data-model="Pet"><a href="">Pet</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -128,7 +128,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -167,7 +167,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>DELETE</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -198,7 +198,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
diff --git a/samples/dynamic-html/docs/operations/StoreApi.html b/samples/dynamic-html/docs/operations/StoreApi.html
index 798372217f0..5e20fd2d10b 100644
--- a/samples/dynamic-html/docs/operations/StoreApi.html
+++ b/samples/dynamic-html/docs/operations/StoreApi.html
@@ -13,7 +13,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="integer"><a href="#">Map</a></div>
+  <div class="model" data-model="integer"><a href="">Map</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -28,7 +28,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="Order"><a href="#">Order</a></div>
+  <div class="model" data-model="Order"><a href="">Order</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -51,7 +51,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="Order"><a href="#">Order</a></div>
+  <div class="model" data-model="Order"><a href="">Order</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -74,7 +74,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>DELETE</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
diff --git a/samples/dynamic-html/docs/operations/UserApi.html b/samples/dynamic-html/docs/operations/UserApi.html
index cc573089bce..79fe6410e5e 100644
--- a/samples/dynamic-html/docs/operations/UserApi.html
+++ b/samples/dynamic-html/docs/operations/UserApi.html
@@ -13,7 +13,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -36,7 +36,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -62,7 +62,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>POST</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -88,7 +88,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="string"><a href="#">String</a></div>
+  <div class="model" data-model="string"><a href="">String</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -119,7 +119,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -134,7 +134,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>GET</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id="User"><a href="#">User</a></div>
+  <div class="model" data-model="User"><a href="">User</a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -157,7 +157,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>PUT</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>
   	
@@ -188,7 +188,7 @@ <h3 class="section">URL</h3>
   <h3 class="section">HTTP Method</h3>
   <code>DELETE</code>
   <h3 class="section">Response Type</h3>
-  <div class="model" id=""><a href="#"></a></div>
+  <div class="model" data-model=""><a href=""></a></div>
   <h3 class="section">Parameters</h3>
   <ul>