j-templates 7.0.3 → 7.0.5

package/Node/vNode.js

@@ -113,6 +113,8 @@ function InitNode(vnode) {
         });
         vnode.scopes.push(componentScope);
         Store_1.ObservableScope.Watch(componentScope, CreateScheduledCallback(function () {
+            if (vnode.destroyed)
+                return;
             const nodes = Store_1.ObservableScope.Peek(componentScope);
             vNode.DestroyAll(vnode.children);
             vnode.children = nodes;
@@ -151,6 +153,8 @@ function StaticChildren(vnode, children) {
         vnode.scopes.push(childrenScope);
         Store_1.ObservableScope.Touch(childrenScope);
         Store_1.ObservableScope.Watch(childrenScope, CreateScheduledCallback(function () {
+            if (vnode.destroyed)
+                return;
             vNode.DestroyAll(vnode.children);
             const nodes = Store_1.ObservableScope.Peek(childrenScope);
             vnode.children = Array.isArray(nodes) ? nodes : [nodes];
@@ -180,6 +184,8 @@ function DynamicChildren(vnode, children, data) {
         DestroyNodeList(nodeList);
     });
     Store_1.ObservableScope.Watch(childrenScope, CreateScheduledCallback(function () {
+        if (vnode.destroyed)
+            return;
         vnode.children = Store_1.ObservableScope.Peek(childrenScope);
         UpdateChildren(vnode);
     }));
@@ -213,7 +219,18 @@ function WrapDynamicChildren(dataScope, nodeList, injector, children) {
             else {
                 const childrenScope = Store_1.ObservableScope.Create(function () {
                     const childNodes = injector_1.Injector.Scope(injector, children, data);
-                    return Array.isArray(childNodes) ? childNodes : [childNodes];
+                    const nodes = Array.isArray(childNodes) ? childNodes : [childNodes];
+                    for (let x = 0; x < nodes.length; x++) {
+                        if (typeof nodes[x] === 'string')
+                            nodes[x] = vNode.Create({
+                                type: 'text',
+                                namespace: null,
+                                props: {
+                                    nodeValue: nodes[x]
+                                }
+                            });
+                    }
+                    return nodes;
                 });
                 list_1.List.Add(nextNodeList, {
                     data,
@@ -276,6 +293,8 @@ function ScheduledAssignment(assign) {
             return;
         scheduled = true;
         nodeConfig_1.NodeConfig.scheduleUpdate(function () {
+            if (scope.destroyed)
+                return;
             scheduled = false;
             const value = Store_1.ObservableScope.Peek(scope);
             assign(value);
@@ -287,6 +306,10 @@ function CreateScheduledCallback(callback) {
     return function () {
         if (scheduled)
             return;
-        nodeConfig_1.NodeConfig.scheduleUpdate(callback);
+        scheduled = true;
+        nodeConfig_1.NodeConfig.scheduleUpdate(function () {
+            scheduled = false;
+            callback();
+        });
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-templates",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "description": "j-templates",
   "license": "MIT",
   "repository": "https://github.com/TypesInCode/jTemplates",