* xover.xml.combine - added extra checks to copy attributes

* Document.prototype.observe - fixed section render
panaxit · Dec 18, 2023 · c7e6681 · c7e6681
1 parent 51e1418
commit c7e6681
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xo.js b/xo.js
@@ -4871,7 +4871,7 @@ xover.xml.staticMerge = function (node1, node2) {
 }
 
 xover.xml.combine = function (target, new_node) {
-    if (target instanceof Element && (target.hasAttribute("xo-source") || target.hasAttribute("xo-stylesheet"))) {
+    if (target instanceof Element && (target.hasAttribute("xo-source") && target.getAttribute("xo-source") == new_node.getAttribute("xo-source") || target.hasAttribute("xo-stylesheet") && target.getAttribute("xo-stylesheet") == new_node.getAttribute("xo-source"))) {
         target.staticAttributes = target.staticAttributes || [...target.attributes || []].map(attr => `@${attr.name}`);
     }
     let swap = document.firstElementChild.cloneNode().classList;
@@ -8234,8 +8234,8 @@ xover.modernize = async function (targetWindow) {
                                 let active_element = document.activeElement;
                                 if (section.contains(active_element)) {
                                     await xover.delay(100);
-                                    section.render().then(() => active_element.classList && active_element.classList.remove("xo-working"))
                                 }
+                                section.render().then(() => active_element.classList && active_element.classList.remove("xo-working"))
                             }
                             //for (let store of Object.values(xover.stores).filter(store => store.document === self)) {
                             //    store.render()