remove trimIndent to reduce memory usage

kwebio · May 27, 2023 · 72bf50d · 72bf50d
1 parent cf587e9
commit 72bf50d
Showing 1 changed file with 42 additions and 45 deletions.
diff --git a/src/main/kotlin/kweb/ElementCreator.kt b/src/main/kotlin/kweb/ElementCreator.kt
@@ -94,29 +94,27 @@ open class ElementCreator<out PARENT_TYPE : Element>(
             element.browser.isCatchingOutbound() != null -> {
                 //language=JavaScript
                 val createElementJs = """
-                    console.log("Creating new element")
-                    let tag = {};
-                    let attributes = {};
-                    let myId = {};
-                    let parentId = {};
-                    let insertBefore = {};
-                    console.log("insertBefore = " + insertBefore)
-                    let newEl = $createElementStatement
-                    newEl.setAttribute("id", myId);
-                    for (const key in attributes) {
-                        if ( key !== "id") {
-                            newEl.setAttribute(key, attributes[key]);
-                        }
-                    }
-                    let parentElement = document.getElementById(parentId);
-                    let startNode = document.getElementById(insertBefore)
-                    
-                    if (insertBefore !== undefined) {
-                        parentElement.insertBefore(newEl, startNode)
-                    } else {
-                        parentElement.appendChild(newEl);
-                    }
-                """.trimIndent()
+let tag = {};
+let attributes = {};
+let myId = {};
+let parentId = {};
+let insertBefore = {};
+let newEl = $createElementStatement
+newEl.setAttribute("id", myId);
+for (const key in attributes) {
+    if ( key !== "id") {
+        newEl.setAttribute(key, attributes[key]);
+    }
+}
+let parentElement = document.getElementById(parentId);
+let startNode = document.getElementById(insertBefore)
+
+if (insertBefore !== undefined) {
+    parentElement.insertBefore(newEl, startNode)
+} else {
+    parentElement.appendChild(newEl);
+}
+                """
                 browser.callJsFunction(
                     createElementJs, JsonPrimitive(tag), JsonObject(mutAttributes), id.json,
                     JsonPrimitive(element.id), JsonPrimitive(insertBefore ?: ""), JsonPrimitive(elementsCreatedCount)
@@ -127,28 +125,27 @@ open class ElementCreator<out PARENT_TYPE : Element>(
                 //The way I have written this function, instead of attributes.get(), we now use attributes[].
                 //language=JavaScript
                 val createElementJs = """
-                    console.log("Creating new element in other place")
-                    let tag = {};
-                    let attributes = {};
-                    let myId = {};
-                    let parentId = {};
-                    let insertBefore = {};
-                    let newEl = document.createElement(tag);
-                    if (attributes["id"] === undefined) {
-                        newEl.setAttribute("id", myId);
-                    }
-                    for (const key in attributes) {
-                            newEl.setAttribute(key, attributes[key]);
-                    }
-                    let parentElement = document.getElementById(parentId);
-                    let startNode = document.getElementById(insertBefore)
-                    
-                    if (insertBefore !== undefined) {
-                        parentElement.insertBefore(newEl, startNode)
-                    } else {
-                        parentElement.appendChild(newEl);
-                    }
-                """.trimIndent()
+let tag = {};
+let attributes = {};
+let myId = {};
+let parentId = {};
+let insertBefore = {};
+let newEl = document.createElement(tag);
+if (attributes["id"] === undefined) {
+    newEl.setAttribute("id", myId);
+}
+for (const key in attributes) {
+        newEl.setAttribute(key, attributes[key]);
+}
+let parentElement = document.getElementById(parentId);
+let startNode = document.getElementById(insertBefore)
+
+if (insertBefore !== undefined) {
+    parentElement.insertBefore(newEl, startNode)
+} else {
+    parentElement.appendChild(newEl);
+}
+                """
                 element.browser.callJsFunction(
                     createElementJs, tag.json, JsonObject(mutAttributes), id.json,
                     element.id.json, JsonPrimitive(insertBefore ?: ""), JsonPrimitive(elementsCreatedCount)