Correct exporting of enum classes

Fixes #2102.

Author: delenius

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

@@ -1,19 +1,12 @@
-
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('{{datatypeWithEnum}}', [], function() {
-        return {{datatypeWithEnum}};
-	 });
-}
-
 var {{datatypeWithEnum}} = function {{datatypeWithEnum}}() {
-	var self = this;
+    var self = this;
+  {{#allowableValues}}{{#enumVars}}
+    /**
+     * @const
+     */
+    self.{{name}} = "{{value}}"{{^-last}},
+    {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
 
-{{#allowableValues}}{{#enumVars}}
-	/**
-	 * @const
-	 */
-	self.{{name}} = "{{value}}"{{^-last}},
-	{{/-last}}{{#-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}}
@@ -73,6 +69,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() { 
 
@@ -50,6 +47,7 @@
   }
 
 
+  
   /**
    * @return {Integer}
    **/
@@ -78,11 +76,14 @@
     this['name'] = name;
   }
 
+  
 
   Category.prototype.toJson = function() {
     return JSON.stringify(this);
   }
 
+  
+
   if (module) {
     module.Category = Category;
   }

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

@@ -14,39 +14,8 @@
   }
 }(this, function(module, ApiClient) {
   'use strict';
-
 
 
-//export module
-if ( typeof define === "function" && define.amd ) {
-	define('StatusEnum', [], function() {
-        return StatusEnum;
-	 });
-}
-
-var StatusEnum = function StatusEnum() {
-	var self = this;
-
-
-	/**
-	 * @const
-	 */
-	self.PLACED = "placed",
-	
-	/**
-	 * @const
-	 */
-	self.APPROVED = "approved",
-	
-	/**
-	 * @const
-	 */
-	self.DELIVERED = "delivered";
-
-}
-
-
-  
   var Order = function Order() { 
 
     /**
@@ -115,6 +84,7 @@ var StatusEnum = function StatusEnum() {
   }
 
 
+  
   /**
    * @return {Integer}
    **/
@@ -201,11 +171,35 @@ var StatusEnum = function StatusEnum() {
     this['complete'] = complete;
   }
 
+  
 
   Order.prototype.toJson = function() {
     return JSON.stringify(this);
   }
 
+  var StatusEnum = function StatusEnum() {
+    var self = this;
+  
+    /**
+     * @const
+     */
+    self.PLACED = "placed",
+    
+    /**
+     * @const
+     */
+    self.APPROVED = "approved",
+    
+    /**
+     * @const
+     */
+    self.DELIVERED = "delivered";
+
+  };
+
+  Order.StatusEnum = StatusEnum;
+
+
   if (module) {
     module.Order = Order;
   }

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

@@ -14,39 +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 = function StatusEnum() {
-	var self = this;
-
-
-	/**
-	 * @const
-	 */
-	self.AVAILABLE = "available",
-	
-	/**
-	 * @const
-	 */
-	self.PENDING = "pending",
-	
-	/**
-	 * @const
-	 */
-	self.SOLD = "sold";
-
-}
-
-
-  
   var Pet = function Pet(photoUrls, name) { 
 
     /**
@@ -117,6 +86,7 @@ var StatusEnum = function StatusEnum() {
   }
 
 
+  
   /**
    * @return {Integer}
    **/
@@ -203,11 +173,35 @@ var StatusEnum = function StatusEnum() {
     this['status'] = status;
   }
 
+  
 
   Pet.prototype.toJson = function() {
     return JSON.stringify(this);
   }
 
+  var StatusEnum = function StatusEnum() {
+    var self = this;
+  
+    /**
+     * @const
+     */
+    self.AVAILABLE = "available",
+    
+    /**
+     * @const
+     */
+    self.PENDING = "pending",
+    
+    /**
+     * @const
+     */
+    self.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() { 
 
@@ -50,6 +47,7 @@
   }
 
 
+  
   /**
    * @return {Integer}
    **/
@@ -78,11 +76,14 @@
     this['name'] = name;
   }
 
+  
 
   Tag.prototype.toJson = function() {
     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() { 
 
@@ -105,6 +102,7 @@
   }
 
 
+  
   /**
    * @return {Integer}
    **/
@@ -219,11 +217,14 @@
     this['userStatus'] = userStatus;
   }
 
+  
 
   User.prototype.toJson = function() {
     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() { 
 
@@ -50,6 +47,7 @@
   }
 
 
+  
   /**
    * @return {Integer}
    **/
@@ -78,11 +76,14 @@
     this['name'] = name;
   }
 
+  
 
   Category.prototype.toJson = function() {
     return JSON.stringify(this);
   }
 
+  
+
   if (module) {
     module.Category = Category;
   }