Skip to content

Commit 636771c

Browse files
committed
Change package for Event interface to get rid of clash with stdlib
1 parent 63525a3 commit 636771c

File tree

14 files changed

+15
-19
lines changed

14 files changed

+15
-19
lines changed

buildSrc/src/main/kotlin/kotlinx/html/generate/main.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ fun generate(packg: String, todir: String, jsdir: String) {
111111
packg(packg + ".js")
112112
emptyLine()
113113
import("kotlinx.html.*")
114-
import("kotlinx.html.attributes.*")
115-
import("kotlinx.html.dom.*")
116-
import("org.w3c.dom.events.*")
114+
import("kotlinx.html.org.w3c.dom.events.Event")
117115
emptyLine()
118116

119117
doNotEditWarning()

src/commonMain/kotlin/Event.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.w3c.dom.events
1+
package kotlinx.html.org.w3c.dom.events
22

33
expect interface Event {
44
fun stopPropagation()

src/commonMain/kotlin/api.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package kotlinx.html
22

3-
import org.w3c.dom.events.*
3+
import kotlinx.html.org.w3c.dom.events.Event
44

55
interface TagConsumer<out R> {
66
fun onTagStart(tag: Tag)

src/commonMain/kotlin/delayed-consumer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kotlinx.html.consumers
22

33
import kotlinx.html.*
4-
import org.w3c.dom.events.*
4+
import kotlinx.html.org.w3c.dom.events.Event
55

66
class DelayedConsumer<T>(val downstream: TagConsumer<T>) : TagConsumer<T> {
77
private var delayed: Tag? = null

src/commonMain/kotlin/filter-consumer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kotlinx.html.consumers
22

33
import kotlinx.html.*
4-
import org.w3c.dom.events.*
4+
import kotlinx.html.org.w3c.dom.events.Event
55

66
object PredicateResults {
77
val PASS = PredicateResult.PASS

src/commonMain/kotlin/finalize-consumer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kotlinx.html.consumers
22

33
import kotlinx.html.*
4-
import org.w3c.dom.events.*
4+
import kotlinx.html.org.w3c.dom.events.Event
55

66
class FinalizeConsumer<F, T>(val downstream: TagConsumer<F>, val block: (F, Boolean) -> T) : TagConsumer<T> {
77
private var level = 0

src/commonMain/kotlin/measure-consumer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kotlinx.html.consumers
22

33
import kotlinx.html.*
4-
import org.w3c.dom.events.*
4+
import kotlinx.html.org.w3c.dom.events.Event
55

66
data class TimedResult<T>(val result: T, val time: Long)
77

src/commonMain/kotlin/stream.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package kotlinx.html.stream
22

33
import kotlinx.html.*
44
import kotlinx.html.consumers.*
5-
import org.w3c.dom.events.*
5+
import kotlinx.html.org.w3c.dom.events.Event
66

77
class HTMLStreamBuilder<out O : Appendable>(val out: O, val prettyPrint: Boolean, val xhtmlCompatible: Boolean) :
88
TagConsumer<O> {

src/jsMain/kotlin/EventJs.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.w3c.dom.events // ktlint-disable filename
1+
package kotlinx.html.org.w3c.dom.events // ktlint-disable filename
22

3-
import org.w3c.dom.*
3+
import org.w3c.dom.events.EventTarget
44

55
public actual external interface Event {
66
val type: String

src/jsMain/kotlin/dom-js.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package kotlinx.html.dom
22

33
import kotlinx.html.*
44
import kotlinx.html.consumers.*
5+
import kotlinx.html.org.w3c.dom.events.Event
56
import org.w3c.dom.*
6-
import org.w3c.dom.events.*
77

88
private inline fun HTMLElement.setEvent(name: String, noinline callback : (Event) -> Unit) : Unit {
99
asDynamic()[name] = callback

src/jsMain/kotlin/generated/gen-event-attrs-js.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package kotlinx.html.js
22

33
import kotlinx.html.*
4-
import kotlinx.html.attributes.*
5-
import kotlinx.html.dom.*
6-
import org.w3c.dom.events.*
4+
import kotlinx.html.org.w3c.dom.events.Event
75

86
/*******************************************************************************
97
DO NOT EDIT

src/jvmMain/kotlin/EventJvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.w3c.dom.events // ktlint-disable filename
1+
package kotlinx.html.org.w3c.dom.events // ktlint-disable filename
22

33
actual interface Event {
44
actual fun stopPropagation()

src/jvmMain/kotlin/dom-jvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package kotlinx.html.dom
22

33
import kotlinx.html.*
44
import kotlinx.html.consumers.*
5+
import kotlinx.html.org.w3c.dom.events.Event
56
import org.w3c.dom.*
6-
import org.w3c.dom.events.*
77
import org.xml.sax.*
88
import java.io.*
99
import java.util.*

src/nativeMain/kotlin/EventNative.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.w3c.dom.events // ktlint-disable filename
1+
package kotlinx.html.org.w3c.dom.events // ktlint-disable filename
22

33
actual interface Event {
44
actual fun stopPropagation()

0 commit comments

Comments
 (0)