Changed behavior of not-defined properties to not be wrapped within an

observable. Closes astoilkov#155.
Kanaye · Dec 3, 2016 · 0ddd249 · 0ddd249
1 parent 2082eef
commit 0ddd249
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/mvc/Model.js b/src/mvc/Model.js
@@ -312,11 +312,11 @@ define([
 
         for (key in dataItem) {
           property = properties[key];
-          if (!property) {
-            property = properties[key] = blocks.extend({}, this._application.Property.Defaults());
-            property.propertyName = key;
+          if (property) {
+            this._setPropertyValue(property, dataItem[key]);
+          } else {
+            this[key] = dataItem[key];
           }
-          this._setPropertyValue(property, dataItem[key]);
         }
       }
 

diff --git a/test/spec/mvc/collection.js b/test/spec/mvc/collection.js
@@ -5,6 +5,7 @@
     var Application;
     var Products;
     var Remotes;
+    var Product;
 
     beforeEach(function () {
       Application = blocks.Application();
@@ -16,7 +17,11 @@
         }
       });
 
-      Products = Application.Collection({
+      Product = Application.Model({
+        FirstName: Application.Property()
+      });
+
+      Products = Application.Collection(Product, {
         options: {
           read: {
             url: 'Products'

diff --git a/test/spec/mvc/model.js b/test/spec/mvc/model.js
@@ -28,12 +28,15 @@
         FirstName: 'Antonio'
       });
 
-      expect(model.id()).toBe(0);
-      expect(model.FirstName()).toBe('Antonio');
+      expect(model.id.toBe(0);
+      expect(model.FirstName.toBe('Antonio');
     });
 
     it('default Application.Property creates observable values', function () {
-      var Product = Application.Model({});
+      var Product = Application.Model({
+        id: Application.Property(),
+        FirstName: Application.Property()
+      });
       Application.start();
       var model = Product({
         id: 0,

diff --git a/test/spec/mvc/property.js b/test/spec/mvc/property.js
@@ -306,6 +306,8 @@ describe('blocks.Application.Property: ', function () {
 
   it('property could define a dependency value', function () {
     var Product = Application.Model({
+      FirstName: Application.Property(),
+      LastName: Application.Property(),
       FullName: Application.Property({
         value: function () {
           return this.FirstName() + ' ' + this.LastName();
@@ -322,6 +324,8 @@ describe('blocks.Application.Property: ', function () {
 
   it('property could define a getter/setter', function () {
     var Product = Application.Model({
+      FirstName: Application.Property(),
+      LastName: Application.Property(),
       FullName: Application.Property({
         value: {
           get: function () {