Merge pull request #2126 from delenius/enum-exports

Correct exporting of enum classes

Author: wing328

modules/swagger-codegen/src/main/resources/Javascript/enumClass.mustache

@@ -1,17 +1,10 @@
-
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('{{datatypeWithEnum}}', [], function() {
-        return {{datatypeWithEnum}};
-	 });
-}
-
 var {{datatypeWithEnum}} = {
 {{#allowableValues}}{{#enumVars}}
-	/**
-	 * @const
-	 */
-	{{name}}: "{{value}}"{{^-last}},
-	{{/-last}}{{/enumVars}}{{/allowableValues}}
+	  /**
+	   * @const
+	   */
+	  {{name}}: "{{value}}"{{^-last}},
+	  {{/-last}}{{/enumVars}}{{/allowableValues}}
+  };
 
-}
+  {{classname}}.{{datatypeWithEnum}} = {{datatypeWithEnum}};

modules/swagger-codegen/src/main/resources/Javascript/model.mustache

@@ -14,11 +14,7 @@
   }
 }(this, function(module, ApiClient{{#imports}}, {{import}}{{/imports}}) {
   'use strict';
-
   {{#models}}{{#model}}
-  {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
-  {{>enumClass}}{{/items}}*/{{/items.isEnum}}{{/vars}}
-
   {{#description}}/**
    * {{description}}
    **/{{/description}}
@@ -74,6 +70,9 @@
     return JSON.stringify(this);
   }
 
+  {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+  {{>enumClass}}{{/items}}*/{{/items.isEnum}}{{/vars}}
+
   if (module) {
     module.{{classname}} = {{classname}};
   }

samples/client/petstore/javascript-promise/src/model/Category.js

@@ -14,10 +14,7 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
-  
 
-
 
   var Category = function Category() { 
 
@@ -86,6 +83,8 @@
     return JSON.stringify(this);
   }
 
+  
+
   if (module) {
     module.Category = Category;
   }

samples/client/petstore/javascript-promise/src/model/Order.js

@@ -14,37 +14,8 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
 
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('StatusEnum', [], function() {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = {
-
-	/**
-	 * @const
-	 */
-	PLACED: "placed",
-	
-	/**
-	 * @const
-	 */
-	APPROVED: "approved",
-	
-	/**
-	 * @const
-	 */
-	DELIVERED: "delivered"
-
-}
-
-
-  
   var Order = function Order() { 
 
     /**
@@ -207,6 +178,27 @@ var StatusEnum = {
     return JSON.stringify(this);
   }
 
+  var StatusEnum = {
+
+	  /**
+	   * @const
+	   */
+	  PLACED: "placed",
+	  
+	  /**
+	   * @const
+	   */
+	  APPROVED: "approved",
+	  
+	  /**
+	   * @const
+	   */
+	  DELIVERED: "delivered"
+  };
+
+  Order.StatusEnum = StatusEnum;
+
+
   if (module) {
     module.Order = Order;
   }

samples/client/petstore/javascript-promise/src/model/Pet.js

@@ -14,37 +14,8 @@
   }
 }(this, function(module, ApiClient, Category, Tag) {
   'use strict';
-
 
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('StatusEnum', [], function() {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = {
-
-	/**
-	 * @const
-	 */
-	AVAILABLE: "available",
-	
-	/**
-	 * @const
-	 */
-	PENDING: "pending",
-	
-	/**
-	 * @const
-	 */
-	SOLD: "sold"
-
-}
-
-
-  
   var Pet = function Pet(photoUrls, name) { 
 
     /**
@@ -209,6 +180,27 @@ var StatusEnum = {
     return JSON.stringify(this);
   }
 
+  var StatusEnum = {
+
+	  /**
+	   * @const
+	   */
+	  AVAILABLE: "available",
+	  
+	  /**
+	   * @const
+	   */
+	  PENDING: "pending",
+	  
+	  /**
+	   * @const
+	   */
+	  SOLD: "sold"
+  };
+
+  Pet.StatusEnum = StatusEnum;
+
+
   if (module) {
     module.Pet = Pet;
   }

samples/client/petstore/javascript-promise/src/model/Tag.js

@@ -14,10 +14,7 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
-  
 
-
 
   var Tag = function Tag() { 
 
@@ -86,6 +83,8 @@
     return JSON.stringify(this);
   }
 
+  
+
   if (module) {
     module.Tag = Tag;
   }

samples/client/petstore/javascript-promise/src/model/User.js

@@ -14,10 +14,7 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
-  
 
-
 
   var User = function User() { 
 
@@ -227,6 +224,8 @@
     return JSON.stringify(this);
   }
 
+  
+
   if (module) {
     module.User = User;
   }

samples/client/petstore/javascript/src/model/Category.js

@@ -14,10 +14,7 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
-  
 
-
 
   var Category = function Category() { 
 
@@ -86,6 +83,8 @@
     return JSON.stringify(this);
   }
 
+  
+
   if (module) {
     module.Category = Category;
   }

samples/client/petstore/javascript/src/model/Order.js

@@ -14,37 +14,8 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
 
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('StatusEnum', [], function() {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = {
-
-	/**
-	 * @const
-	 */
-	PLACED: "placed",
-	
-	/**
-	 * @const
-	 */
-	APPROVED: "approved",
-	
-	/**
-	 * @const
-	 */
-	DELIVERED: "delivered"
-
-}
-
-
-  
   var Order = function Order() { 
 
     /**
@@ -207,6 +178,27 @@ var StatusEnum = {
     return JSON.stringify(this);
   }
 
+  var StatusEnum = {
+
+	  /**
+	   * @const
+	   */
+	  PLACED: "placed",
+	  
+	  /**
+	   * @const
+	   */
+	  APPROVED: "approved",
+	  
+	  /**
+	   * @const
+	   */
+	  DELIVERED: "delivered"
+  };
+
+  Order.StatusEnum = StatusEnum;
+
+
   if (module) {
     module.Order = Order;
   }

samples/client/petstore/javascript/src/model/Pet.js

@@ -14,37 +14,8 @@
   }
 }(this, function(module, ApiClient, Category, Tag) {
   'use strict';
-
 
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('StatusEnum', [], function() {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = {
-
-	/**
-	 * @const
-	 */
-	AVAILABLE: "available",
-	
-	/**
-	 * @const
-	 */
-	PENDING: "pending",
-	
-	/**
-	 * @const
-	 */
-	SOLD: "sold"
-
-}
-
-
-  
   var Pet = function Pet(photoUrls, name) { 
 
     /**
@@ -209,6 +180,27 @@ var StatusEnum = {
     return JSON.stringify(this);
   }
 
+  var StatusEnum = {
+
+	  /**
+	   * @const
+	   */
+	  AVAILABLE: "available",
+	  
+	  /**
+	   * @const
+	   */
+	  PENDING: "pending",
+	  
+	  /**
+	   * @const
+	   */
+	  SOLD: "sold"
+  };
+
+  Pet.StatusEnum = StatusEnum;
+
+
   if (module) {
     module.Pet = Pet;
   }