revert recent changes that seem to be causing very weird css issues, then remove .trimIndent() again

sanity · sanity · commit 5a396d12da3b · 2023-05-28T10:49:09.000-05:00
diff --git a/src/main/kotlin/kweb/Element.kt b/src/main/kotlin/kweb/Element.kt
@@ -269,7 +269,7 @@ open class Element(
                                     let el = document.getElementById(id);
                                     if (el.classList) el.classList.add(className);
                                     else if (!hasClass(el, className)) el.className += " " + className;
-                                """.trimIndent(), id.json, JsonPrimitive(class_)
+                                """, id.json, JsonPrimitive(class_)
                         )
                     }
                 }
@@ -302,7 +302,7 @@ open class Element(
                                 var reg = new RegExp("(\\s|^)" + className + "(\\s|${'$'})");
                                 el.className = el.className.replace(reg, " ");
                             }
-                        """.trimIndent(), id.json, JsonPrimitive(class_)
+                        """, id.json, JsonPrimitive(class_)
                 )
             }
         }
@@ -348,7 +348,7 @@ open class Element(
                                     element.removeChild(element.firstChild);
                                 }
                             }
-                        """.trimIndent(), id.json
+                        """, id.json
                 )
             }
         }
@@ -383,7 +383,7 @@ open class Element(
                                 startSpan.parentNode.removeChild(startSpan.nextSibling);
                                 nextSibling = startSpan.nextSibling;
                             }
-                        """.trimIndent(), JsonPrimitive(startSpanId), JsonPrimitive(endSpanId)
+                        """, JsonPrimitive(startSpanId), JsonPrimitive(endSpanId)
                 )
             }
         }
@@ -405,7 +405,7 @@ open class Element(
                     """
                                 let element = document.getElementById({});
                                 element.removeChild(element.children[{}]);
-                        """.trimIndent(), id.json, position.json
+                        """, id.json, position.json
                 )
             }
         }
@@ -419,7 +419,7 @@ open class Element(
     fun text(value: String): Element {
         val jsoupDoc = browser.htmlDocument.get()
         //language=JavaScript
-        val setTextJS = """document.getElementById({}).textContent = {};""".trimIndent()
+        val setTextJS = """document.getElementById({}).textContent = {};"""
         when {
             jsoupDoc != null && (browser.isCatchingOutbound() == null || browser.isCatchingOutbound() == RENDER) -> {
                 val element = jsoupDoc.getElementById(this.id)
@@ -464,7 +464,7 @@ open class Element(
         val createTextNodeJs = """
             var ntn = document.createTextNode({});
             document.getElementById({}).appendChild(ntn);
-        """.trimIndent()
+        """
         when {
             jsoupDoc != null && (browser.isCatchingOutbound() == null || browser.isCatchingOutbound() == RENDER) -> {
                 val element = jsoupDoc.getElementById(this.id)
@@ -483,7 +483,7 @@ open class Element(
         val wrappedJS = """
             return document.getElementById({}).addEventListener({}, function(event) {
                 $jsCode
-            });""".trimIndent()
+            });"""
         browser.callJsFunction(wrappedJS, id.json, JsonPrimitive(eventName))
     }
 
@@ -510,7 +510,7 @@ open class Element(
                 callbackWs({}, $eventObject);
             });
             return true;
-        """.trimIndent()
+        """
         //Adding event listener was causing the client to send a Client2ServerMessage with a null data field. This caused an error
         //We make the client return true to avoid that issue.
         //Then on the server we only invoke our callback on eventObjects, by checking that payload is a JsonObject.
@@ -589,7 +589,7 @@ open class Element(
             """
             let element = document.getElementById({});
             element.parentNode.removeChild(element);
-        """.trimIndent(), id.json
+        """, id.json
         )
     }
 
@@ -607,7 +607,7 @@ open class Element(
                     let element = document.getElementById(id);
                     element.parentNode.removeChild(element);
                 }
-            """.trimIndent(), id.json
+            """, id.json
             )
         } catch (e: IllegalStateException) {
 
diff --git a/src/main/kotlin/kweb/ElementCreator.kt b/src/main/kotlin/kweb/ElementCreator.kt
@@ -116,7 +116,7 @@ open class ElementCreator<out PARENT_TYPE : Element>(
                     } else {
                         parentElement.appendChild(newEl);
                     }
-                """.trimIndent()
+                """
                 browser.callJsFunction(
                     createElementJs, JsonPrimitive(tag), JsonObject(mutAttributes), id.json,
                     JsonPrimitive(element.id), JsonPrimitive(insertBefore ?: ""), JsonPrimitive(elementsCreatedCount)
@@ -148,7 +148,7 @@ open class ElementCreator<out PARENT_TYPE : Element>(
                     } else {
                         parentElement.appendChild(newEl);
                     }
-                """.trimIndent()
+                """
                 element.browser.callJsFunction(
                     createElementJs, tag.json, JsonObject(mutAttributes), id.json,
                     element.id.json, JsonPrimitive(insertBefore ?: ""), JsonPrimitive(elementsCreatedCount)
diff --git a/src/main/kotlin/kweb/Kweb.kt b/src/main/kotlin/kweb/Kweb.kt
@@ -464,7 +464,7 @@ class Kweb private constructor(
                         Internal Server Error.
 
                         Please include code $logToken in any error report to help us track it down.
-""".trimIndent()
+"""
             )
         }
     }
diff --git a/src/main/kotlin/kweb/ValueElement.kt b/src/main/kotlin/kweb/ValueElement.kt
@@ -39,7 +39,7 @@ abstract class ValueElement(
                 const element = document.getElementById({});
                 element.value = {};
                 delete element.dataset.previousInput;
-                """.trimIndent(),
+                """,
             element.id.json, newValue.json
         )
     }
diff --git a/src/main/kotlin/kweb/WebBrowser.kt b/src/main/kotlin/kweb/WebBrowser.kt
@@ -365,7 +365,7 @@ class WebBrowser(val sessionId: String, val httpRequestInfo: HttpRequestInfo, va
         //language=JavaScript
         callJsFunction("""
         history.pushState({ }, "", {});
-        """.trimIndent(), JsonPrimitive(url))
+        """, JsonPrimitive(url))
     }
 
     /**
diff --git a/src/main/kotlin/kweb/html/Document.kt b/src/main/kotlin/kweb/html/Document.kt
@@ -82,7 +82,7 @@ class Document(val receiver: WebBrowser) : EventGenerator<Document> {
             return document.addEventListener({}, function(event) {
                 $jsCode
             });
-        """.trimIndent()
+        """
         documentScope.launch {
             receiver.callJsFunctionWithResult(wrappedJS, JsonPrimitive(eventName))
         }
diff --git a/src/main/kotlin/kweb/html/Window.kt b/src/main/kotlin/kweb/html/Window.kt
@@ -24,7 +24,7 @@ class Window(override val browser: WebBrowser) : EventGenerator<Window> {
             return window.addEventListener({}, function(event) {
                 $jsCode
             });
-        """.trimIndent()
+        """
         browser.callJsFunction(wrappedJS, eventName.json)
     }
 
@@ -38,7 +38,7 @@ class Window(override val browser: WebBrowser) : EventGenerator<Window> {
                 callbackWs({}, $eventObject);
             });
             return true;
-        """.trimIndent()
+        """
         browser.callJsFunctionWithCallback(js, callbackId, callback = { payload ->
             if (payload is JsonObject) {
                 callback.invoke(payload)
diff --git a/src/main/kotlin/kweb/html/fileUpload/FileFormInput.kt b/src/main/kotlin/kweb/html/fileUpload/FileFormInput.kt
@@ -52,7 +52,7 @@ class FileFormInput {
                 fr.onload = function(){
                     callbackWs({}, {base64Content: fr.result, fileSize: fd.size, fileName: fd.name});
                 }
-            """.trimIndent()
+            """
 
         inputElement.browser.callJsFunctionWithCallback(js, callbackId, callback = { result ->
             logger.info("Result is $result")
diff --git a/src/main/kotlin/kweb/plugins/fomanticUI/FomanticUIClasses.kt b/src/main/kotlin/kweb/plugins/fomanticUI/FomanticUIClasses.kt
@@ -1203,7 +1203,7 @@ class FomanticUIClasses : AttributeBuilder() {
                 error("""
             The .ui getter has already been used on this SematicUIClasses object.  Please ensure you are creating a
             fresh FomanticUIClasses object (using the 'fomantic' getter for every element).
-""".trimIndent())
+""")
             }
             classes("ui")
             uiClassAlreadyPresent = true
diff --git a/src/main/kotlin/kweb/plugins/specificKeyUp/SpecificKeyUp.kt b/src/main/kotlin/kweb/plugins/specificKeyUp/SpecificKeyUp.kt
@@ -40,7 +40,7 @@ fun InputElement.attachKeySpecificKeyupEvent(vararg keys: String) {
             element.dispatchEvent(keySpecificKeyUpEvent);
         }
     });
-""".trimIndent(), id.json, JsonPrimitive(keys.joinToString(separator = ","))
+""", id.json, JsonPrimitive(keys.joinToString(separator = ","))
     )
 }
 
diff --git a/src/main/kotlin/kweb/state/renderEach.kt b/src/main/kotlin/kweb/state/renderEach.kt
@@ -54,7 +54,7 @@ fun <ITEM : Any, EL : Element> ElementCreator<EL>.renderEach(
             }
             parent.removeChild(start_element);
             parent.removeChild(end_element);
-            """.trimIndent(), JsonPrimitive(renderHandleToRemove.startId),
+            """, JsonPrimitive(renderHandleToRemove.startId),
             JsonPrimitive(renderHandleToRemove.endId)
         )
         renderHandleToRemove.delete()
@@ -80,7 +80,7 @@ fun <ITEM : Any, EL : Element> ElementCreator<EL>.renderEach(
             elementsToMove.forEach(function (item){
                 listParent.insertBefore(item, endMarker);
             });
-            """.trimIndent()
+            """
         browser.callJsFunction(moveItemCode, JsonPrimitive(itemStartMarker),
             JsonPrimitive(itemEndMarker), JsonPrimitive(newPosMarker)
         )
diff --git a/src/test/kotlin/kweb/demos/todo/TodoApp.kt b/src/test/kotlin/kweb/demos/todo/TodoApp.kt
@@ -99,7 +99,7 @@ class TodoApp {
                             You may find the source code for this app
                             <a href="https://github.com/kwebio/kweb-core/tree/master/src/main/kotlin/kweb/demos/todo">here</a>.
                             """
-                                .trimIndent()
+                                
                         )
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ open class Element(`
`269`	`269`	`let el = document.getElementById(id);`
`270`	`270`	`if (el.classList) el.classList.add(className);`
`271`	`271`	`else if (!hasClass(el, className)) el.className += " " + className;`
`272`		`- """.trimIndent(), id.json, JsonPrimitive(class_)`
	`272`	`+ """, id.json, JsonPrimitive(class_)`
`273`	`273`	`)`
`274`	`274`	`}`
`275`	`275`	`}`
`@@ -302,7 +302,7 @@ open class Element(`
`302`	`302`	`var reg = new RegExp("(\\s\|^)" + className + "(\\s\|${'$'})");`
`303`	`303`	`el.className = el.className.replace(reg, " ");`
`304`	`304`	`}`
`305`		`- """.trimIndent(), id.json, JsonPrimitive(class_)`
	`305`	`+ """, id.json, JsonPrimitive(class_)`
`306`	`306`	`)`
`307`	`307`	`}`
`308`	`308`	`}`
`@@ -348,7 +348,7 @@ open class Element(`
`348`	`348`	`element.removeChild(element.firstChild);`
`349`	`349`	`}`
`350`	`350`	`}`
`351`		`- """.trimIndent(), id.json`
	`351`	`+ """, id.json`
`352`	`352`	`)`
`353`	`353`	`}`
`354`	`354`	`}`
`@@ -383,7 +383,7 @@ open class Element(`
`383`	`383`	`startSpan.parentNode.removeChild(startSpan.nextSibling);`
`384`	`384`	`nextSibling = startSpan.nextSibling;`
`385`	`385`	`}`
`386`		`- """.trimIndent(), JsonPrimitive(startSpanId), JsonPrimitive(endSpanId)`
	`386`	`+ """, JsonPrimitive(startSpanId), JsonPrimitive(endSpanId)`
`387`	`387`	`)`
`388`	`388`	`}`
`389`	`389`	`}`
`@@ -405,7 +405,7 @@ open class Element(`
`405`	`405`	`"""`
`406`	`406`	`let element = document.getElementById({});`
`407`	`407`	`element.removeChild(element.children[{}]);`
`408`		`- """.trimIndent(), id.json, position.json`
	`408`	`+ """, id.json, position.json`
`409`	`409`	`)`
`410`	`410`	`}`
`411`	`411`	`}`
`@@ -419,7 +419,7 @@ open class Element(`
`419`	`419`	`fun text(value: String): Element {`
`420`	`420`	`val jsoupDoc = browser.htmlDocument.get()`
`421`	`421`	`//language=JavaScript`
`422`		`- val setTextJS = """document.getElementById({}).textContent = {};""".trimIndent()`
	`422`	`+ val setTextJS = """document.getElementById({}).textContent = {};"""`
`423`	`423`	`when {`
`424`	`424`	`jsoupDoc != null && (browser.isCatchingOutbound() == null \|\| browser.isCatchingOutbound() == RENDER) -> {`
`425`	`425`	`val element = jsoupDoc.getElementById(this.id)`
`@@ -464,7 +464,7 @@ open class Element(`
`464`	`464`	`val createTextNodeJs = """`
`465`	`465`	`var ntn = document.createTextNode({});`
`466`	`466`	`document.getElementById({}).appendChild(ntn);`
`467`		`- """.trimIndent()`
	`467`	`+ """`
`468`	`468`	`when {`
`469`	`469`	`jsoupDoc != null && (browser.isCatchingOutbound() == null \|\| browser.isCatchingOutbound() == RENDER) -> {`
`470`	`470`	`val element = jsoupDoc.getElementById(this.id)`
`@@ -483,7 +483,7 @@ open class Element(`
`483`	`483`	`val wrappedJS = """`
`484`	`484`	`return document.getElementById({}).addEventListener({}, function(event) {`
`485`	`485`	`$jsCode`
`486`		`- });""".trimIndent()`
	`486`	`+ });"""`
`487`	`487`	`browser.callJsFunction(wrappedJS, id.json, JsonPrimitive(eventName))`
`488`	`488`	`}`
`489`	`489`
`@@ -510,7 +510,7 @@ open class Element(`
`510`	`510`	`callbackWs({}, $eventObject);`
`511`	`511`	`});`
`512`	`512`	`return true;`
`513`		`- """.trimIndent()`
	`513`	`+ """`
`514`	`514`	`//Adding event listener was causing the client to send a Client2ServerMessage with a null data field. This caused an error`
`515`	`515`	`//We make the client return true to avoid that issue.`
`516`	`516`	`//Then on the server we only invoke our callback on eventObjects, by checking that payload is a JsonObject.`
`@@ -589,7 +589,7 @@ open class Element(`
`589`	`589`	`"""`
`590`	`590`	`let element = document.getElementById({});`
`591`	`591`	`element.parentNode.removeChild(element);`
`592`		`- """.trimIndent(), id.json`
	`592`	`+ """, id.json`
`593`	`593`	`)`
`594`	`594`	`}`
`595`	`595`
`@@ -607,7 +607,7 @@ open class Element(`
`607`	`607`	`let element = document.getElementById(id);`
`608`	`608`	`element.parentNode.removeChild(element);`
`609`	`609`	`}`
`610`		`- """.trimIndent(), id.json`
	`610`	`+ """, id.json`
`611`	`611`	`)`
`612`	`612`	`} catch (e: IllegalStateException) {`
`613`	`613`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ class Kweb private constructor(`
`464`	`464`	`Internal Server Error.`
`465`	`465`
`466`	`466`	`Please include code $logToken in any error report to help us track it down.`
`467`		`-""".trimIndent()`
	`467`	`+"""`
`468`	`468`	`)`
`469`	`469`	`}`
`470`	`470`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ abstract class ValueElement(`
`39`	`39`	`const element = document.getElementById({});`
`40`	`40`	`element.value = {};`
`41`	`41`	`delete element.dataset.previousInput;`
`42`		`- """.trimIndent(),`
	`42`	`+ """,`
`43`	`43`	`element.id.json, newValue.json`
`44`	`44`	`)`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ class WebBrowser(val sessionId: String, val httpRequestInfo: HttpRequestInfo, va`
`365`	`365`	`//language=JavaScript`
`366`	`366`	`callJsFunction("""`
`367`	`367`	`history.pushState({ }, "", {});`
`368`		`- """.trimIndent(), JsonPrimitive(url))`
	`368`	`+ """, JsonPrimitive(url))`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class Document(val receiver: WebBrowser) : EventGenerator<Document> {`
`82`	`82`	`return document.addEventListener({}, function(event) {`
`83`	`83`	`$jsCode`
`84`	`84`	`});`
`85`		`- """.trimIndent()`
	`85`	`+ """`
`86`	`86`	`documentScope.launch {`
`87`	`87`	`receiver.callJsFunctionWithResult(wrappedJS, JsonPrimitive(eventName))`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class FileFormInput {`
`52`	`52`	`fr.onload = function(){`
`53`	`53`	`callbackWs({}, {base64Content: fr.result, fileSize: fd.size, fileName: fd.name});`
`54`	`54`	`}`
`55`		`- """.trimIndent()`
	`55`	`+ """`
`56`	`56`
`57`	`57`	`inputElement.browser.callJsFunctionWithCallback(js, callbackId, callback = { result ->`
`58`	`58`	`logger.info("Result is $result")`
Original file line number	Diff line number	Diff line change
`@@ -1203,7 +1203,7 @@ class FomanticUIClasses : AttributeBuilder() {`
`1203`	`1203`	`error("""`
`1204`	`1204`	`The .ui getter has already been used on this SematicUIClasses object. Please ensure you are creating a`
`1205`	`1205`	`fresh FomanticUIClasses object (using the 'fomantic' getter for every element).`
`1206`		`-""".trimIndent())`
	`1206`	`+""")`
`1207`	`1207`	`}`
`1208`	`1208`	`classes("ui")`
`1209`	`1209`	`uiClassAlreadyPresent = true`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ fun InputElement.attachKeySpecificKeyupEvent(vararg keys: String) {`
`40`	`40`	`element.dispatchEvent(keySpecificKeyUpEvent);`
`41`	`41`	`}`
`42`	`42`	`});`
`43`		`-""".trimIndent(), id.json, JsonPrimitive(keys.joinToString(separator = ","))`
	`43`	`+""", id.json, JsonPrimitive(keys.joinToString(separator = ","))`
`44`	`44`	`)`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ fun <ITEM : Any, EL : Element> ElementCreator<EL>.renderEach(`
`54`	`54`	`}`
`55`	`55`	`parent.removeChild(start_element);`
`56`	`56`	`parent.removeChild(end_element);`
`57`		`- """.trimIndent(), JsonPrimitive(renderHandleToRemove.startId),`
	`57`	`+ """, JsonPrimitive(renderHandleToRemove.startId),`
`58`	`58`	`JsonPrimitive(renderHandleToRemove.endId)`
`59`	`59`	`)`
`60`	`60`	`renderHandleToRemove.delete()`
`@@ -80,7 +80,7 @@ fun <ITEM : Any, EL : Element> ElementCreator<EL>.renderEach(`
`80`	`80`	`elementsToMove.forEach(function (item){`
`81`	`81`	`listParent.insertBefore(item, endMarker);`
`82`	`82`	`});`
`83`		`- """.trimIndent()`
	`83`	`+ """`
`84`	`84`	`browser.callJsFunction(moveItemCode, JsonPrimitive(itemStartMarker),`
`85`	`85`	`JsonPrimitive(itemEndMarker), JsonPrimitive(newPosMarker)`
`86`	`86`	`)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class TodoApp {`
`99`	`99`	`You may find the source code for this app`
`100`	`100`	`<a href="https://github.com/kwebio/kweb-core/tree/master/src/main/kotlin/kweb/demos/todo">here</a>.`
`101`	`101`	`"""`
`102`		`- .trimIndent()`
	`102`	`+`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`	`}`