Merge pull request #114 from Kanaye/bug-#113

Added check if observable._expressions has current expression. Fixes #113.
astoilkov · Nov 14, 2015 · ac8190d · ac8190d
2 parents 6e96796 + c72c83b
commit ac8190d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/query/observable.js b/src/query/observable.js
@@ -170,6 +170,7 @@ define([
           var value;
           var isProperty;
           var propertyName;
+          var rawValue;
 
           Observer.startObserving();
 
@@ -183,7 +184,8 @@ define([
             }
 
             try {
-              value = blocks.unwrap(parameterQueryCache[expression.expression](context));
+              rawValue = parameterQueryCache[expression.expression](context);
+              value = blocks.unwrap(rawValue);
             } catch (ex) {
               value = '';
             }
@@ -197,6 +199,10 @@ define([
             propertyName = expression.attr ? dom.propFix[expression.attr.toLowerCase()] || expression.attr : null;
 
             if (element) {
+              if (blocks.isObservable(rawValue) && rawValue._expressions.indexOf(expression) == -1) {
+                  rawValue._expressions.push(expression);
+              }
+
               if (expression.attr) {
                 if(isProperty) {
                   element[propertyName] = Expression.GetValue(context, null, expression.entire);