Merge pull request #115 from Kanaye/template-fix-v2

Fixed the serverside template-data-query I broke in a previous change.
astoilkov · Nov 14, 2015 · 9bd1f1d · 9bd1f1d
2 parents ac8190d + 55d9a33
commit 9bd1f1d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/node/overrides.js b/src/node/overrides.js
@@ -113,11 +113,14 @@ define([
   };
 
   blocks.queries.template.preprocess = function (domQuery, html, value) {
-    if (VirtualElement.Is(html)) {
-      html = html.html();
-    } else if (blocks.isObject(html)) {
-      html =  GLOBAL[html.rawValue] && GLOBAL[html.rawValue].html();
+    if (blocks.isObject(html)) {
+      if (VirtualElement.Is(html.rawValue)) {
+        html = html.rawValue.html();
+      } else {
+        html =  GLOBAL[html.rawValue] && GLOBAL[html.rawValue].html();
+      }
     }
+
     if (blocks.isObject(value) && value.parameterName) {
       value = value.rawValue;
     }