0.15.3

Author: rsavian

Gulpfile.js

@@ -73,4 +73,4 @@ gulp.task('test', () => {
 });
 
 gulp.task('default', ['clean', 'ts']);
-gulp.task('release', ['default', 'docs']);
+gulp.task('release', ['default']);

README.md

@@ -252,6 +252,8 @@ _onClickHandler(event) {
 
 ## Release History
 
+ * 2017-02-08 v0.15.3 BaseModel - Wasn't really fixed. Now it is fixed. Fingers crossed!
+ 
  * 2017-02-08 v0.15.2 BaseModel - Fixed issue with arrays having the same data for every item in the array when instantiated directly on the property. Fixed issue with child models not actually being cloned into new objects when .clone() is called on the parent model. 
 
  * 2017-01-19 v0.15.1 Add missing Interface *.d.ts files.

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "structurejs",
-    "version": "0.15.2",
+    "version": "0.15.3",
     "dependencies": {
         "jquery": "*",
         "handlebars": "*"

js/model/BaseModel.js

@@ -177,13 +177,14 @@ var __extends = (this && this.__extends) || function (d, b) {
                 // Instantiate it and pass in the updateData to the constructor.
                 returnData = new propertyData(updateData, this.sjsOptions);
             }
+            else if ((updateData instanceof BaseModel) === true) {
+                returnData = updateData.clone();
+            }
             else if ((propertyData instanceof BaseModel) === true) {
                 // If propertyData is an instance of a BaseModel class and has already been created.
                 // Call the update method and pass in the updateData.
-                returnData = propertyData.update(updateData);
-            }
-            else if ((updateData instanceof BaseModel) === true) {
-                returnData = updateData.clone();
+                propertyData.update(updateData);
+                returnData = propertyData;
             }
             else {
                 // Else just return the updateData to the property.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "structure-js",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "A class based utility library for building modular and scalable web platform applications. Features opt-in classes and utilities which provide a solid foundation and toolset to build your next project.",
   "url": "https://github.com/codeBelt/StructureJS",
   "repository": "https://github.com/codeBelt/StructureJS",

ts/model/BaseModel.ts

@@ -194,15 +194,16 @@ class BaseModel extends BaseObject implements IBaseModel
             // Instantiate it and pass in the updateData to the constructor.
             returnData = new propertyData(updateData, this.sjsOptions);
         }
+        else if ((updateData instanceof BaseModel) === true)
+        {
+            returnData = updateData.clone();
+        }
         else if ((propertyData instanceof BaseModel) === true)
         {
             // If propertyData is an instance of a BaseModel class and has already been created.
             // Call the update method and pass in the updateData.
-            returnData = propertyData.update(updateData);
-        }
-        else if ((updateData instanceof BaseModel) === true)
-        {
-            returnData = updateData.clone();
+            propertyData.update(updateData);
+            returnData = propertyData;
         }
         else
         {