Merge pull request #145 from Kanaye/collection-fix

Reverted one change from #143 that broke collections.
astoilkov · May 28, 2016 · 2ecd567 · 2ecd567
2 parents dddbd0a + 703f0d7
commit 2ecd567
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/mvc/Model.js b/src/mvc/Model.js
@@ -284,11 +284,12 @@ define([
 
     _setPropertyValue: function (property, propertyValue) {
       var propertyName = property.propertyName;
-      if (property.isObservable) {
-        this[propertyName] = this._createObservable(property, propertyValue);
-      } else if (blocks.isFunction(this[propertyName])) {
+
+      if (blocks.isFunction(this[propertyName])) {
         this[propertyName](propertyValue);
         this._dataSource.update(this.dataItem());
+      } else if (property.isObservable) {
+        this[propertyName] = this._createObservable(property, propertyValue);
       } else  {
         this[propertyName] = function () {
           return propertyValue;