v2.0

Author: manuel-lohmus

browser.js

@@ -190,10 +190,9 @@
                 if (CreateLink) {
 
                     element.wsLink = WsUser.CreateLink(path, element);
-                    element.datacontext = element.wsLink.datacontext;
+                    element.wsLink.bindAllElements = function (elem) { bindAllElements(elem, rebinding); };
                     element.setAttribute("linked", path);
                     element.removeAttribute("link");
-                    bindAllElements(element, rebinding);
                 }
             }
 
@@ -470,15 +469,14 @@
 
                 element: { value: d.rootElement, writable: false, configurable: false, enumerable: false },
 
-                source: { value: d.source, writable: false, configurable: false, enumerable: false },
-                //source: {
-                //    configurable: false, enumerable: false,
+                source: {
+                    configurable: false, enumerable: false,
 
-                //    get: function () {
+                    get: function () {
 
-                //        return d.arrPath.reduce(function (s, k) { return s[k]; }, d.rootSource);
-                //    }
-                //},
+                        return d.arrPath.reduce(function (s, k) { return s[k]; }, d.rootSource);
+                    }
+                },
 
                 property: { value: d.property || "-change", writable: false, configurable: false, enumerable: false },
 
@@ -541,7 +539,7 @@
 
                 if (d.rootSource?._events && (
                     !d.rootSource._events["-"] ||
-                    !d.rootSource._events["-"].find(function (fn) { return fn.name.includes("_bindHandler"); })
+                    !d.rootSource._events["-"].find(function (fn) { return fn.name.includes("bindHandler"); })
                 )) {
 
                     d.rootSource.on("-", bindHandler.bind(d.rootElement), d.rootElement);

datacontext.js

@@ -446,26 +446,24 @@
 
                     var ret = Reflect.set(target, property, newValue, proxy);
 
-                    var isDC = newValue && newValue._isDataContext;
-                    var isNew = isDC && newValue._parent !== proxy && oldValue === undefined;
+                    var isDC = newValue?._isDataContext;
+                    var isNew = oldValue === undefined;
+
                     if (isDC) {
                         newValue._isModified = true;
                         newValue._parent = proxy;
-                    }
-
-                    if (isDC && newValue._propertyName !== property) {
-
-                        //console.log("'-reposition' set: newValue propertyName is change ", newValue + "", ">", property, event);
-                        eventName = "reposition";
                         newValue._propertyName = property;
                     }
-                    else if (isDC && isNew) {
 
+                    if (isNew) {
                         //console.log("'-new' set: oldValue is undefined", property, event);
                         eventName = "new";
                     }
+                    else if (isDC && typeof newValue._propertyName === 'string' && newValue._propertyName !== property) {
+                        //console.log("'-reposition' set: newValue propertyName is change ", newValue + "", ">", property, event);
+                        eventName = "reposition";
+                    }
                     else {
-
                         //console.log("'-set' set: newValue parent is change", property, event);
                         eventName = "set";
                     }
@@ -678,6 +676,7 @@
 
                     if (!def._isDataContext) { def = createDataContext(def); }
                     if (val?._events) { def._events = val._events; }
+                    if (val?._propertyName && val._parent) { val._parent[val._propertyName] = def; }
 
                     it.next();
                     it.next();
@@ -686,6 +685,14 @@
                 }
                 else if (_typeof(val) !== _typeof(def)) {
 
+                    if (val?._isDataContext) {
+
+                        def = createDataContext(def);
+                        def._events = val._events;
+
+                        if (val?._propertyName && val._parent) { val._parent[val._propertyName] = def; }
+                    }
+
                     return def;
                 }