Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Change package for Event interface to get rid of clash with stdlib
  • Loading branch information
ilgonmic committed Jun 29, 2022
1 parent 63525a3 commit 636771c
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 19 deletions.
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/kotlinx/html/generate/main.kt
Expand Up @@ -111,9 +111,7 @@ fun generate(packg: String, todir: String, jsdir: String) {
packg(packg + ".js")
emptyLine()
import("kotlinx.html.*")
import("kotlinx.html.attributes.*")
import("kotlinx.html.dom.*")
import("org.w3c.dom.events.*")
import("kotlinx.html.org.w3c.dom.events.Event")
emptyLine()

doNotEditWarning()
Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/Event.kt
@@ -1,4 +1,4 @@
package org.w3c.dom.events
package kotlinx.html.org.w3c.dom.events

expect interface Event {
fun stopPropagation()
Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/api.kt
@@ -1,6 +1,6 @@
package kotlinx.html

import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

interface TagConsumer<out R> {
fun onTagStart(tag: Tag)
Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/delayed-consumer.kt
@@ -1,7 +1,7 @@
package kotlinx.html.consumers

import kotlinx.html.*
import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

class DelayedConsumer<T>(val downstream: TagConsumer<T>) : TagConsumer<T> {
private var delayed: Tag? = null
Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/filter-consumer.kt
@@ -1,7 +1,7 @@
package kotlinx.html.consumers

import kotlinx.html.*
import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

object PredicateResults {
val PASS = PredicateResult.PASS
Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/finalize-consumer.kt
@@ -1,7 +1,7 @@
package kotlinx.html.consumers

import kotlinx.html.*
import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

class FinalizeConsumer<F, T>(val downstream: TagConsumer<F>, val block: (F, Boolean) -> T) : TagConsumer<T> {
private var level = 0
Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/measure-consumer.kt
@@ -1,7 +1,7 @@
package kotlinx.html.consumers

import kotlinx.html.*
import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

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

Expand Down
2 changes: 1 addition & 1 deletion src/commonMain/kotlin/stream.kt
Expand Up @@ -2,7 +2,7 @@ package kotlinx.html.stream

import kotlinx.html.*
import kotlinx.html.consumers.*
import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

class HTMLStreamBuilder<out O : Appendable>(val out: O, val prettyPrint: Boolean, val xhtmlCompatible: Boolean) :
TagConsumer<O> {
Expand Down
4 changes: 2 additions & 2 deletions src/jsMain/kotlin/EventJs.kt
@@ -1,6 +1,6 @@
package org.w3c.dom.events // ktlint-disable filename
package kotlinx.html.org.w3c.dom.events // ktlint-disable filename

import org.w3c.dom.*
import org.w3c.dom.events.EventTarget

public actual external interface Event {
val type: String
Expand Down
2 changes: 1 addition & 1 deletion src/jsMain/kotlin/dom-js.kt
Expand Up @@ -2,8 +2,8 @@ package kotlinx.html.dom

import kotlinx.html.*
import kotlinx.html.consumers.*
import kotlinx.html.org.w3c.dom.events.Event
import org.w3c.dom.*
import org.w3c.dom.events.*

private inline fun HTMLElement.setEvent(name: String, noinline callback : (Event) -> Unit) : Unit {
asDynamic()[name] = callback
Expand Down
4 changes: 1 addition & 3 deletions src/jsMain/kotlin/generated/gen-event-attrs-js.kt
@@ -1,9 +1,7 @@
package kotlinx.html.js

import kotlinx.html.*
import kotlinx.html.attributes.*
import kotlinx.html.dom.*
import org.w3c.dom.events.*
import kotlinx.html.org.w3c.dom.events.Event

/*******************************************************************************
DO NOT EDIT
Expand Down
2 changes: 1 addition & 1 deletion src/jvmMain/kotlin/EventJvm.kt
@@ -1,4 +1,4 @@
package org.w3c.dom.events // ktlint-disable filename
package kotlinx.html.org.w3c.dom.events // ktlint-disable filename

actual interface Event {
actual fun stopPropagation()
Expand Down
2 changes: 1 addition & 1 deletion src/jvmMain/kotlin/dom-jvm.kt
Expand Up @@ -2,8 +2,8 @@ package kotlinx.html.dom

import kotlinx.html.*
import kotlinx.html.consumers.*
import kotlinx.html.org.w3c.dom.events.Event
import org.w3c.dom.*
import org.w3c.dom.events.*
import org.xml.sax.*
import java.io.*
import java.util.*
Expand Down
2 changes: 1 addition & 1 deletion src/nativeMain/kotlin/EventNative.kt
@@ -1,4 +1,4 @@
package org.w3c.dom.events // ktlint-disable filename
package kotlinx.html.org.w3c.dom.events // ktlint-disable filename

actual interface Event {
actual fun stopPropagation()
Expand Down

0 comments on commit 636771c

Please sign in to comment.