Merge pull request #2115 from delenius/enums

Use objects for enums, not constructor functions

Author: wing328

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

@@ -6,14 +6,12 @@ if ( typeof define === "function" && define.amd ) {
 	 });
 }
 
-var {{datatypeWithEnum}} = function {{datatypeWithEnum}}() {
-	var self = this;
-
+var {{datatypeWithEnum}} = {
 {{#allowableValues}}{{#enumVars}}
 	/**
 	 * @const
 	 */
-	self.{{name}} = "{{value}}"{{^-last}},
-	{{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
+	{{name}}: "{{value}}"{{^-last}},
+	{{/-last}}{{/enumVars}}{{/allowableValues}}
 
 }

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

@@ -24,24 +24,22 @@ if ( typeof define === "function" && define.amd ) {
 	 });
 }
 
-var StatusEnum = function StatusEnum() {
-	var self = this;
-
+var StatusEnum = {
 
 	/**
 	 * @const
 	 */
-	self.PLACED = "placed",
+	PLACED: "placed",
 
 	/**
 	 * @const
 	 */
-	self.APPROVED = "approved",
+	APPROVED: "approved",
 
 	/**
 	 * @const
 	 */
-	self.DELIVERED = "delivered";
+	DELIVERED: "delivered"
 
 }
 

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

@@ -24,24 +24,22 @@ if ( typeof define === "function" && define.amd ) {
 	 });
 }
 
-var StatusEnum = function StatusEnum() {
-	var self = this;
-
+var StatusEnum = {
 
 	/**
 	 * @const
 	 */
-	self.AVAILABLE = "available",
+	AVAILABLE: "available",
 
 	/**
 	 * @const
 	 */
-	self.PENDING = "pending",
+	PENDING: "pending",
 
 	/**
 	 * @const
 	 */
-	self.SOLD = "sold";
+	SOLD: "sold"
 
 }
 

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

@@ -24,24 +24,22 @@ if ( typeof define === "function" && define.amd ) {
 	 });
 }
 
-var StatusEnum = function StatusEnum() {
-	var self = this;
-
+var StatusEnum = {
 
 	/**
 	 * @const
 	 */
-	self.PLACED = "placed",
+	PLACED: "placed",
 
 	/**
 	 * @const
 	 */
-	self.APPROVED = "approved",
+	APPROVED: "approved",
 
 	/**
 	 * @const
 	 */
-	self.DELIVERED = "delivered";
+	DELIVERED: "delivered"
 
 }
 

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

@@ -24,24 +24,22 @@ if ( typeof define === "function" && define.amd ) {
 	 });
 }
 
-var StatusEnum = function StatusEnum() {
-	var self = this;
-
+var StatusEnum = {
 
 	/**
 	 * @const
 	 */
-	self.AVAILABLE = "available",
+	AVAILABLE: "available",
 
 	/**
 	 * @const
 	 */
-	self.PENDING = "pending",
+	PENDING: "pending",
 
 	/**
 	 * @const
 	 */
-	self.SOLD = "sold";
+	SOLD: "sold"
 
 }