From 46338224e12e71845dc02e955f4ac58b42bc82db Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Tue, 6 Apr 2021 04:20:33 +0300 Subject: [PATCH] Remove deprecated JQuery --- .../testData/basic/common/InEmptyImport.kt | 1 - .../semantics/WebDemoCanvasExamplesTest.java | 58 --- .../webDemoCanvasExamples/Creatures.kt | 342 ------------ .../webDemoCanvasExamples/Fancy lines.kt | 73 --- .../webDemoCanvasExamples/Hello, Kotlin.kt | 113 ---- .../webDemoCanvasExamples/Traffic light.kt | 492 ------------------ libraries/stdlib/api/js-v1/jquery.kt | 104 ---- libraries/stdlib/api/js-v1/jquery.ui.kt | 29 -- libraries/stdlib/api/js/jquery.kt | 104 ---- libraries/stdlib/api/js/jquery.ui.kt | 29 -- .../js-ir-minimal-for-test/build.gradle.kts | 1 - libraries/stdlib/js/src/jquery/common.kt | 82 --- libraries/stdlib/js/src/jquery/ui.kt | 42 -- 13 files changed, 1470 deletions(-) delete mode 100644 js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.java delete mode 100644 js/js.translator/testData/webDemoCanvasExamples/Creatures.kt delete mode 100644 js/js.translator/testData/webDemoCanvasExamples/Fancy lines.kt delete mode 100644 js/js.translator/testData/webDemoCanvasExamples/Hello, Kotlin.kt delete mode 100644 js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt delete mode 100644 libraries/stdlib/api/js-v1/jquery.kt delete mode 100644 libraries/stdlib/api/js-v1/jquery.ui.kt delete mode 100644 libraries/stdlib/api/js/jquery.kt delete mode 100644 libraries/stdlib/api/js/jquery.ui.kt delete mode 100644 libraries/stdlib/js/src/jquery/common.kt delete mode 100644 libraries/stdlib/js/src/jquery/ui.kt diff --git a/idea/idea-completion/testData/basic/common/InEmptyImport.kt b/idea/idea-completion/testData/basic/common/InEmptyImport.kt index c418140114e..14cd0e22826 100644 --- a/idea/idea-completion/testData/basic/common/InEmptyImport.kt +++ b/idea/idea-completion/testData/basic/common/InEmptyImport.kt @@ -4,5 +4,4 @@ import // EXIST: kotlin // EXIST_JAVA_ONLY: javax -// EXIST_JS_ONLY: jquery // ABSENT: Array, Integer diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.java deleted file mode 100644 index f3e48107062..00000000000 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/WebDemoCanvasExamplesTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.js.test.semantics; - -import org.jetbrains.annotations.NotNull; - -import javax.script.ScriptException; - -/* -* We can't really check that this examples work in non-browser environment, so we just check that examples compile and -* running them produce expected error. -* */ -public final class WebDemoCanvasExamplesTest extends AbstractWebDemoExamplesTest { - - public WebDemoCanvasExamplesTest() { - super("webDemoCanvasExamples/"); - } - - public void testCreatures() throws Exception { - doTest("Creatures.kt", "$"); - } - - public void testHelloKotlin() throws Exception { - doTest("Hello, Kotlin.kt", "$"); - } - - public void testFancyLines() throws Exception { - doTest("Fancy lines.kt", "$"); - } - - public void testTrafficLight() throws Exception { - doTest("Traffic light.kt", "window"); - } - - private void doTest(@NotNull String filename, @NotNull String firstUnknownSymbolEncountered) throws Exception { - try { - runMainAndCheckOutput(filename, ""); - fail(); - } - catch (ScriptException e) { - verifyException("\"" + firstUnknownSymbolEncountered + "\"", e.getMessage()); - } - catch (IllegalStateException e) { - verifyException(firstUnknownSymbolEncountered, e.getMessage()); - } - } - - private static void verifyException(@NotNull String firstUnknownSymbolEncountered, @NotNull String message) { - String expectedErrorMessage = "ReferenceError: " + firstUnknownSymbolEncountered + " is not defined"; - assertTrue("Unexpected error when running compiled canvas examples with rhino.\n" + - "Expected message contains \"" + expectedErrorMessage + "\".\n" + - "Message: " + message, - message.contains(expectedErrorMessage)); - } -} diff --git a/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt b/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt deleted file mode 100644 index 4de91bd2753..00000000000 --- a/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt +++ /dev/null @@ -1,342 +0,0 @@ -/* - * In this example strange creatures are watching the kotlin logo. - * You can drag'n'drop them as well as the logo. Doubleclick to add - * more creatures but be careful. They may be watching you! - */ -@file:Suppress("DEPRECATION_ERROR") - -package creatures - -import jquery.* -import org.w3c.dom.* -import kotlin.browser.document -import kotlin.browser.window -import kotlin.math.* - - -fun getImage(path: String): HTMLImageElement { - val image = window.document.createElement("img") as HTMLImageElement - image.src = path - return image -} - -val canvas: HTMLCanvasElement - get() { - return window.document.getElementsByTagName("canvas").item(0)!! as HTMLCanvasElement - } - -val context: CanvasRenderingContext2D - get() { - return canvas.getContext("2d") as CanvasRenderingContext2D - } - -abstract class Shape() { - - abstract fun draw(state: CanvasState) - // these two abstract methods defines that our shapes can be dragged - operator abstract fun contains(mousePos: Vector): Boolean - - abstract var pos: Vector - - var selected: Boolean = false - - // a couple of helper extension methods we'll be using in the derived classes - fun CanvasRenderingContext2D.shadowed(shadowOffset: Vector, alpha: Double, render: CanvasRenderingContext2D.() -> Unit) { - save() - shadowColor = "rgba(100, 100, 100, $alpha)" - shadowBlur = 5.0 - shadowOffsetX = shadowOffset.x - shadowOffsetY = shadowOffset.y - render() - restore() - } - - fun CanvasRenderingContext2D.fillPath(constructPath: CanvasRenderingContext2D.() -> Unit) { - beginPath() - constructPath() - closePath() - fill() - } -} - -val Kotlin = Logo(v(250.0, 75.0)) - -class Logo(override var pos: Vector) : Shape() { - val relSize: Double = 0.15 - val shadowOffset = v(-3.0, 3.0) - val imageSize = v(200.0, 200.0) - var size: Vector = imageSize * relSize - // get-only properties like this saves you lots of typing and are very expressive - val position: Vector - get() = if (selected) pos - shadowOffset else pos - - - fun drawLogo(state: CanvasState) { - size = imageSize * (state.size.x / imageSize.x) * relSize - // getKotlinLogo() is a 'magic' function here defined only for purposes of demonstration but in fact it just find an element containing the logo - state.context.drawImage(getImage("https://try.kotlinlang.org/static/images/canvas/Kotlin-logo.png"), 0.0, 0.0, - imageSize.x, imageSize.y, - position.x, position.y, - size.x, size.y) - } - - override fun draw(state: CanvasState) { - val context = state.context - if (selected) { - // using helper we defined in Shape class - context.shadowed(shadowOffset, 0.2) { - drawLogo(state) - } - } else { - drawLogo(state) - } - } - - override fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, size) - - val centre: Vector - get() = pos + size * 0.5 -} - -val gradientGenerator by lazy { RadialGradientGenerator(context) } - -class Creature(override var pos: Vector, val state: CanvasState) : Shape() { - - val shadowOffset = v(-5.0, 5.0) - val colorStops = gradientGenerator.getNext() - val relSize = 0.05 - // these properties have no backing fields and in java/javascript they could be represented as little helper functions - val radius: Double - get() = state.width * relSize - val position: Vector - get() = if (selected) pos - shadowOffset else pos - val directionToLogo: Vector - get() = (Kotlin.centre - position).normalized - - //notice how the infix call can make some expressions extremely expressive - override fun contains(mousePos: Vector) = pos distanceTo mousePos < radius - - // defining more nice extension functions - fun CanvasRenderingContext2D.circlePath(position: Vector, rad: Double) { - arc(position.x, position.y, rad, 0.0, 2 * PI, false) - } - - //notice we can use an extension function we just defined inside another extension function - fun CanvasRenderingContext2D.fillCircle(position: Vector, rad: Double) { - fillPath { - circlePath(position, rad) - } - } - - override fun draw(state: CanvasState) { - val context = state.context - if (!selected) { - drawCreature(context) - } else { - drawCreatureWithShadow(context) - } - } - - fun drawCreature(context: CanvasRenderingContext2D) { - context.fillStyle = getGradient(context) - context.fillPath { - tailPath(context) - circlePath(position, radius) - } - drawEye(context) - } - - fun getGradient(context: CanvasRenderingContext2D): CanvasGradient { - val gradientCentre = position + directionToLogo * (radius / 4) - val gradient = context.createRadialGradient(gradientCentre.x, gradientCentre.y, 1.0, gradientCentre.x, gradientCentre.y, 2 * radius) - for (colorStop in colorStops) { - gradient.addColorStop(colorStop.first, colorStop.second) - } - return gradient - } - - fun tailPath(context: CanvasRenderingContext2D) { - val tailDirection = -directionToLogo - val tailPos = position + tailDirection * radius * 1.0 - val tailSize = radius * 1.6 - val angle = PI / 6.0 - val p1 = tailPos + tailDirection.rotatedBy(angle) * tailSize - val p2 = tailPos + tailDirection.rotatedBy(-angle) * tailSize - val middlePoint = position + tailDirection * radius * 1.0 - context.moveTo(tailPos.x, tailPos.y) - context.lineTo(p1.x, p1.y) - context.quadraticCurveTo(middlePoint.x, middlePoint.y, p2.x, p2.y) - context.lineTo(tailPos.x, tailPos.y) - } - - fun drawEye(context: CanvasRenderingContext2D) { - val eyePos = directionToLogo * radius * 0.6 + position - val eyeRadius = radius / 3 - val eyeLidRadius = eyeRadius / 2 - context.fillStyle = "#FFFFFF" - context.fillCircle(eyePos, eyeRadius) - context.fillStyle = "#000000" - context.fillCircle(eyePos, eyeLidRadius) - } - - fun drawCreatureWithShadow(context: CanvasRenderingContext2D) { - context.shadowed(shadowOffset, 0.7) { - context.fillStyle = getGradient(context) - fillPath { - tailPath(context) - context.circlePath(position, radius) - } - } - drawEye(context) - } -} - -class CanvasState(val canvas: HTMLCanvasElement) { - var width = canvas.width - var height = canvas.height - val size: Vector - get() = v(width.toDouble(), height.toDouble()) - val context = creatures.context - var valid = false - var shapes = mutableListOf() - var selection: Shape? = null - var dragOff = Vector() - val interval = 1000 / 30 - - init { - jq(canvas).mousedown { - valid = false - selection = null - val mousePos = mousePos(it) - for (shape in shapes) { - if (mousePos in shape) { - dragOff = mousePos - shape.pos - shape.selected = true - selection = shape - break - } - } - } - - jq(canvas).mousemove { - if (selection != null) { - selection!!.pos = mousePos(it) - dragOff - valid = false - } - } - - jq(canvas).mouseup { - if (selection != null) { - selection!!.selected = false - } - selection = null - valid = false - } - - jq(canvas).dblclick { - val newCreature = Creature(mousePos(it), this@CanvasState) - addShape(newCreature) - valid = false - } - - window.setInterval({ - draw() - }, interval) - } - - fun mousePos(e: MouseEvent): Vector { - var offset = Vector() - var element: HTMLElement? = canvas - while (element != null) { - val el: HTMLElement = element - offset += Vector(el.offsetLeft.toDouble(), el.offsetTop.toDouble()) - element = el.offsetParent as HTMLElement? - } - return Vector(e.pageX, e.pageY) - offset - } - - fun addShape(shape: Shape) { - shapes.add(shape) - valid = false - } - - fun clear() { - context.fillStyle = "#FFFFFF" - context.fillRect(0.0, 0.0, width.toDouble(), height.toDouble()) - context.strokeStyle = "#000000" - context.lineWidth = 4.0 - context.strokeRect(0.0, 0.0, width.toDouble(), height.toDouble()) - } - - fun draw() { - if (valid) return - - clear() - for (shape in shapes.asReversed()) { - shape.draw(this) - } - Kotlin.draw(this) - valid = true - } -} - -class RadialGradientGenerator(val context: CanvasRenderingContext2D) { - val gradients = mutableListOf>>() - var current = 0 - - fun newColorStops(vararg colorStops: Pair) { - gradients.add(colorStops) - } - - init { - newColorStops(Pair(0.0, "#F59898"), Pair(0.5, "#F57373"), Pair(1.0, "#DB6B6B")) - newColorStops(Pair(0.39, "rgb(140,167,209)"), Pair(0.7, "rgb(104,139,209)"), Pair(0.85, "rgb(67,122,217)")) - newColorStops(Pair(0.0, "rgb(255,222,255)"), Pair(0.5, "rgb(255,185,222)"), Pair(1.0, "rgb(230,154,185)")) - newColorStops(Pair(0.0, "rgb(255,209,114)"), Pair(0.5, "rgb(255,174,81)"), Pair(1.0, "rgb(241,145,54)")) - newColorStops(Pair(0.0, "rgb(132,240,135)"), Pair(0.5, "rgb(91,240,96)"), Pair(1.0, "rgb(27,245,41)")) - newColorStops(Pair(0.0, "rgb(250,147,250)"), Pair(0.5, "rgb(255,80,255)"), Pair(1.0, "rgb(250,0,217)")) - } - - fun getNext(): Array> { - val result = gradients.get(current) - current = (current + 1) % gradients.size - return result - } -} - -fun v(x: Double, y: Double) = Vector(x, y) - -class Vector(val x: Double = 0.0, val y: Double = 0.0) { - operator fun plus(v: Vector) = v(x + v.x, y + v.y) - operator fun unaryMinus() = v(-x, -y) - operator fun minus(v: Vector) = v(x - v.x, y - v.y) - operator fun times(koef: Double) = v(x * koef, y * koef) - infix fun distanceTo(v: Vector) = sqrt((this - v).sqr) - fun rotatedBy(theta: Double): Vector { - val sin = sin(theta) - val cos = cos(theta) - return v(x * cos - y * sin, x * sin + y * cos) - } - - fun isInRect(topLeft: Vector, size: Vector) = (x >= topLeft.x) && (x <= topLeft.x + size.x) && - (y >= topLeft.y) && (y <= topLeft.y + size.y) - - val sqr: Double - get() = x * x + y * y - val normalized: Vector - get() = this * (1.0 / sqrt(sqr)) -} - -fun main(args: Array) { - jq { - val state = CanvasState(canvas) - state.addShape(Kotlin) - state.addShape(Creature(state.size * 0.25, state)) - state.addShape(Creature(state.size * 0.75, state)) - window.setTimeout({ - state.valid = false - Unit - }, 1000) - } -} - diff --git a/js/js.translator/testData/webDemoCanvasExamples/Fancy lines.kt b/js/js.translator/testData/webDemoCanvasExamples/Fancy lines.kt deleted file mode 100644 index 44f3d1aca01..00000000000 --- a/js/js.translator/testData/webDemoCanvasExamples/Fancy lines.kt +++ /dev/null @@ -1,73 +0,0 @@ -/* -This example is based on example from html5 canvas2D docs: - http://www.w3.org/TR/2dcontext/ -Note that only a subset of the api is supported for now. -*/ -@file:Suppress("DEPRECATION_ERROR") - -package fancylines - -import jquery.* -import org.w3c.dom.CanvasRenderingContext2D -import org.w3c.dom.HTMLCanvasElement -import kotlin.browser.document -import kotlin.browser.window -import kotlin.random.* - -fun main(args: Array) { - jq { - FancyLines().run() - } -} - -val canvas: HTMLCanvasElement - get() { - return window.document.getElementsByTagName("canvas").item(0) as HTMLCanvasElement - } - -class FancyLines() { - val context = canvas.getContext("2d") as CanvasRenderingContext2D - val height = canvas.height.toDouble() - val width = canvas.width.toDouble() - fun nextX() = Random.nextDouble(width) - fun nextY() = Random.nextDouble(height) - var x = nextX() - var y = nextY() - var hue = 0 - - fun line() { - context.save(); - - context.beginPath(); - - context.lineWidth = Random.nextDouble(20.0) - context.moveTo(x, y); - - x = nextX() - y = nextY() - - context.bezierCurveTo(nextX(), nextY(), - nextX(), nextY(), x, y) - - hue += Random.nextInt(10) - - context.strokeStyle = "hsl($hue, 50%, 50%)"; - - context.shadowColor = "white"; - context.shadowBlur = 10.0; - - context.stroke(); - - context.restore(); - } - - fun blank() { - context.fillStyle = "rgba(255,255,1,0.1)"; - context.fillRect(0.0, 0.0, width, height); - } - - fun run() { - window.setInterval({ line() }, 40); - window.setInterval({ blank() }, 100); - } -} diff --git a/js/js.translator/testData/webDemoCanvasExamples/Hello, Kotlin.kt b/js/js.translator/testData/webDemoCanvasExamples/Hello, Kotlin.kt deleted file mode 100644 index 2b5496749f0..00000000000 --- a/js/js.translator/testData/webDemoCanvasExamples/Hello, Kotlin.kt +++ /dev/null @@ -1,113 +0,0 @@ -/* - This shows simple text floating around. -*/ -@file:Suppress("DEPRECATION_ERROR") - -package hello - -import jquery.* -import org.w3c.dom.CanvasRenderingContext2D -import org.w3c.dom.HTMLCanvasElement -import kotlin.browser.document -import kotlin.browser.window -import kotlin.random.* -import kotlin.math.* - -val canvas: HTMLCanvasElement - get() { - return window.document.getElementsByTagName("canvas").item(0)!! as HTMLCanvasElement - } - -val context: CanvasRenderingContext2D - get() { - return canvas.getContext("2d") as CanvasRenderingContext2D - } - - -val width: Int - get() { - return canvas.width - } - -val height: Int - get() { - return canvas.height - } - - -// class representing a floating text -class HelloKotlin() { - var relX = Random.nextDouble(0.2, 0.4) - var relY = Random.nextDouble(0.4, 0.6) - - val absX: Double - get() = (relX * width) - val absY: Double - get() = (relY * height) - - var relXVelocity = randomVelocity() - var relYVelocity = randomVelocity() - - - val message = "Hello, Kotlin!" - val textHeightInPixels = 20 - init { - context.font = "bold ${textHeightInPixels}px Georgia, serif" - } - val textWidthInPixels = context.measureText(message).width - - fun draw() { - context.save() - move() - // if you using chrome chances are good you wont see the shadow - context.shadowColor = "#000000" - context.shadowBlur = 5.0 - context.shadowOffsetX = -4.0 - context.shadowOffsetY = 4.0 - context.fillStyle = "rgb(242,160,110)" - context.fillText(message, absX, absY) - context.restore() - } - - fun move() { - val relTextWidth = textWidthInPixels / width - if (relX > (1.0 - relTextWidth - relXVelocity.absoluteValue) || relX < relXVelocity.absoluteValue) { - relXVelocity *= -1 - } - val relTextHeight = textHeightInPixels / height - if (relY > (1.0 - relYVelocity.absoluteValue) || relY < relYVelocity.absoluteValue + relTextHeight) { - relYVelocity *= -1 - } - relX += relXVelocity - relY += relYVelocity - } - - fun randomVelocity() = Random.nextDouble(-0.03, 0.03) // same as 0.03 * Math.random() * (if (Math.random() < 0.5) 1 else -1) - -} - -fun renderBackground() { - context.save() - context.fillStyle = "#5C7EED" - context.fillRect(0.0, 0.0, width.toDouble(), height.toDouble()) - context.restore() -} - -fun main(args: Array) { - jq { - val interval = 50 - // we pass a literal that constructs a new HelloKotlin object - val logos = Array(3) { - HelloKotlin() - } - - window.setInterval({ - renderBackground() - for (logo in logos) { - logo.draw() - } - }, interval) - } -} - - diff --git a/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt b/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt deleted file mode 100644 index 2e05a84cc3d..00000000000 --- a/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt +++ /dev/null @@ -1,492 +0,0 @@ -/* - * In this example you can see a crossroads. Traffic light change color by timer, - * but you can change it manually using controls at the right part of screen. - */ -@file:Suppress("DEPRECATION_ERROR") - -package traffic - -import jquery.* -import org.w3c.dom.* -import kotlin.browser.document -import kotlin.browser.window -import kotlin.math.* -import kotlin.random.* -import kotlin.js.Date - -fun getImage(path: String): HTMLImageElement { - val image = window.document.createElement("img") as HTMLImageElement - image.src = path - return image -} - -val canvas: HTMLCanvasElement - get() { - return window.document.getElementsByTagName("canvas").item(0)!! as HTMLCanvasElement - } - -val context: CanvasRenderingContext2D - get() { - return canvas.getContext("2d") as CanvasRenderingContext2D - } - - -val PATH_TO_IMAGES = "https://try.kotlinlang.org/static/images/canvas/" - - -val state: CanvasState by lazy { CanvasState(canvas) } - -var trafficLightUp = TrafficLight(v(180.0, 181.0), "up", "red") -var trafficLightDown = TrafficLight(v(100.0, 77.0), "down", "red") -var trafficLightLeft = TrafficLight(v(228.0, 109.0), "left", "green") -var trafficLightRight = TrafficLight(v(55.0, 145.0), "right", "green") - - -fun main(args: Array) { - state.addShape(Map(v(10.0, 10.0))) - - state.addShape(trafficLightLeft) - state.addShape(trafficLightUp) - state.addShape(trafficLightDown) - state.addShape(trafficLightRight) - state.addShape(Car(v(178.0, 205.0), "up", "red")) - state.addShape(Car(v(95.0, 4.0), "down", "white")) - state.addShape(Car(v(278.0, 108.0), "left", "blue")) - state.addShape(Car(v(0.0, 142.0), "right", "black")) - state.addShape(Border()) - state.addShape(Image(PATH_TO_IMAGES + "controls.png", v(380.0, 10.0), v(190.0, 56.0))) - state.addShape(Button(PATH_TO_IMAGES + "lr.png", v(420.0, 70.0), v(120.0, 50.0))) - state.addShape(Button(PATH_TO_IMAGES + "ud.png", v(455.0, 120.0), v(50.0, 120.0))) -} - -fun v(x: Double, y: Double) = Vector(x, y) - -class Image(val src: String, override var pos: Vector, var imageSize: Vector) : Shape() { - override fun draw() { - state.context.drawImage(getImage(src), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - imageSize.x, imageSize.y) - } - - fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize) -} - -class Button(val src: String, override var pos: Vector, var imageSize: Vector) : Shape() { - var isMouseOver = false - var isMouseDown = false - - override fun draw() { - if (isMouseOver) { - state.context.shadowed(v(-3.0, 3.0), 1.2) { - state.context.drawImage(getImage(src), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - imageSize.x, imageSize.y) - } - } else if (isMouseDown) { - state.context.shadowed(v(-3.0, 3.0), 0.8) { - state.context.drawImage(getImage(src), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - imageSize.x, imageSize.y) - } - } else { - state.context.drawImage(getImage(src), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - imageSize.x, imageSize.y) - } - } - - fun mouseClick() { - isMouseDown = true - window.setTimeout({ - isMouseDown = false - Unit - }, 1000) - } - - fun mouseOver() { - isMouseOver = true - window.setTimeout({ - isMouseOver = false - Unit - }, 1000) - } - - - operator fun contains(mousePos: Vector): Boolean = mousePos.isInRect(pos, imageSize) -} - -class Border() : Shape() { - override var pos = Vector(4.0, 4.0); - - override fun draw() { - state.context.fillStyle = Colors.white - state.context.fillRect(2.0, 4.0, 10.0, 292.0) - state.context.fillRect(330.0, 4.0, 370.0, 292.0) - state.context.fillRect(2.0, 2.0, 330.0, 10.0) - state.context.fillRect(4.0, 265.0, 340.0, 380.0) - state.context.strokeStyle = Colors.black - state.context.lineWidth = 4.0 - state.context.strokeRect(0.0, 0.0, state.width.toDouble(), state.height.toDouble()) - } - -} - -class Timer(override var pos: Vector) : Shape() { - var timeLeftForChangeColor: Char = 'c' - var timeStartLastChangeColor = Date().getTime(); - var timerLength = 13 - - override fun draw() { - timeLeftForChangeColor = ("" + (timerLength - (Date().getTime() - timeStartLastChangeColor) / 1000)).get(0) - state.context.font = "bold 9px Arial, serif" - state.context.fillStyle = Colors.black - state.context.fillText("" + timeLeftForChangeColor, pos.x, pos.y) - } - - fun resetTimer() { - timeStartLastChangeColor = Date().getTime() - timerLength = 10 - } -} - -//Colors constants -object Colors { - val black: String = "#000000" - val white = "#FFFFFF" - val grey = "#C0C0C0" - val red = "#EF4137" - val yellow = "#FCE013" - val green = "#0E9648" -} - -class TrafficLight(override var pos: Vector, val direction: String, val startColor: String) : Shape() { - val list = mutableListOf() - var size = Vector(27.0, 34.0); - var timer = Timer(Vector(pos.x + 6, pos.y + 12)) - var currentColor = startColor; - var isForceColorChange = false - var shouldChangeColorForward = (startColor == "red") - - init { - list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "red_color.png")) - list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "yellow_color.png")) - list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "green_color.png")) - list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "green_color_flash.png")) - } - - override fun draw() { - when (currentColor) { - "red" -> list.get(0).draw() - "yellow" -> list.get(1).draw() - "green" -> list.get(2).draw() - "green_flash" -> list.get(3).draw() - else -> { - } - } - timer.draw() - } - - fun setRed() { - if (currentColor != "red" && currentColor != "yellow" && currentColor != "green_flash") { - isForceColorChange = true - changeColor() - } - } - - fun setGreen() { - if (currentColor != "green" && currentColor != "green_flash" && currentColor != "yellow") { - isForceColorChange = true - changeColor() - } - } - - fun changeColor() { - if (shouldChangeColorForward) changeColorForward() else changeColorBackward() - } - - fun changeColorForward() { - shouldChangeColorForward = false - currentColor = "yellow" - window.setTimeout({ - if (!isForceColorChange) timer.resetTimer() else isForceColorChange = false - currentColor = "green" - Unit - }, 3000) - } - - - fun changeColorBackward() { - shouldChangeColorForward = true - currentColor = "green_flash" - window.setTimeout({ - currentColor = "yellow" - window.setTimeout({ - if (!isForceColorChange) timer.resetTimer() else isForceColorChange = false - currentColor = "red" - Unit - }, 1000) - }, 2000) - } - - fun canMove(): Boolean { - return (currentColor != "red" && currentColor != "yellow") - } -} - - -//One element from Traffic light -class TrafficLightItem(override var pos: Vector, val imageSrc: String) : Shape() { - val relSize: Double = 0.5 - val imageSize = v(33.0, 33.0) - var size: Vector = imageSize * relSize - - var isFlashing = (imageSrc == PATH_TO_IMAGES + "green_color_flash.png") - var isFlashNow = false - var countOfFlash = 0 - - override fun draw() { - size = imageSize * relSize - if (isFlashing) { - if (isFlashNow) { - if (countOfFlash > 6) { - isFlashNow = false - countOfFlash = 0 - } else { - countOfFlash++ - } - } else { - state.context.drawImage(getImage(PATH_TO_IMAGES + "green_color.png"), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - size.x, size.y) - if (countOfFlash > 6) { - isFlashNow = true - countOfFlash = 0 - } else { - countOfFlash++ - } - } - } else { - state.context.drawImage(getImage(imageSrc), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - size.x, size.y) - } - } -} - - -class Car(override var pos: Vector, val direction: String, val color: String) : Shape() { - val imageSize = v(25.0, 59.0) - fun randomSpeed() = Random.nextDouble(2.0, 10.0) - var speed = randomSpeed() - - override fun draw() { - if (direction == "up" || direction == "down") { - state.context.drawImage(getImage(PATH_TO_IMAGES + color + "_car.png"), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - imageSize.x, imageSize.y) - if ((!isNearStopLine()) || (trafficLightUp.canMove() && isNearStopLine()) ) { - move() - } else { - speed = randomSpeed() - } - } else { - state.context.drawImage(getImage(PATH_TO_IMAGES + color + "_car.png"), 0.0, 0.0, - imageSize.y, imageSize.x, - pos.x, pos.y, - imageSize.y, imageSize.x) - if ((!isNearStopLine()) || (trafficLightLeft.canMove() && isNearStopLine()) ) { - move() - } else { - speed = randomSpeed() - } - - } - - } - - fun isNearStopLine(): Boolean { - when (direction) { - "up" -> return (pos.y > 198 && pos.y < 208) - "down" -> return (pos.y > 10 && pos.y < 20) - "right" -> return (pos.x > -8 && pos.x < 2) - "left" -> return (pos.x > 243 && pos.x < 253) - else -> return false - } - - } - - fun move() { - var x = pos.x - var y = pos.y - - when (direction) { - "up" -> if (pos.y < -50) y = 250.0 else y = pos.y - speed - "down" -> if (pos.y > 300) y = 0.0 else y = pos.y + speed - "right" -> if (pos.x > 300) x = -10.0 else x = pos.x + speed - "left" -> if (pos.x < -50) x = 340.0 else x = pos.x - speed - else -> { - } - } - - pos = v(x, y) - } -} - -class Map(override var pos: Vector) : Shape() { - val relSize: Double = 0.8 - val imageSize = v(420.0, 323.0) - var size: Vector = imageSize * relSize - - override fun draw() { - size = imageSize * relSize - state.context.drawImage(getImage(PATH_TO_IMAGES + "crossroads.jpg"), 0.0, 0.0, - imageSize.x, imageSize.y, - pos.x, pos.y, - size.x, size.y) - } -} - - -class CanvasState(val canvas: HTMLCanvasElement) { - val context = traffic.context - var shapes = mutableListOf() - - var width = canvas.width - var height = canvas.height - - val size: Vector - get() = v(width.toDouble(), height.toDouble()) - - fun addShape(shape: Shape) { - shapes.add(shape) - } - - init { - jq(canvas).click { - val mousePos = mousePos(it) - shapeLoop@ for (shape in shapes) { - if (shape is Button && mousePos in shape) { - val name = shape.src - shape.mouseClick() - when (name) { - PATH_TO_IMAGES + "lr.png" -> { - - trafficLightUp.setRed() - trafficLightDown.setRed() - trafficLightLeft.setGreen() - trafficLightRight.setGreen() - } - PATH_TO_IMAGES + "ud.png" -> { - - trafficLightLeft.setRed() - trafficLightRight.setRed() - trafficLightUp.setGreen() - trafficLightDown.setGreen() - - } - else -> continue@shapeLoop - } - - } - } - } - - jq(canvas).mousemove { - val mousePos = mousePos(it) - for (shape in shapes) { - if (shape is Button && mousePos in shape) { - shape.mouseOver() - } - } - } - - window.setInterval({ - draw() - }, 1000 / 30) - - window.setInterval({ - trafficLightUp.changeColor() - trafficLightLeft.changeColor() - trafficLightRight.changeColor() - trafficLightDown.changeColor() - }, 10000) - - - } - - - fun mousePos(e: MouseEvent): Vector { - var offset = Vector() - var element: HTMLElement? = canvas - while (element != null) { - val el: HTMLElement = element - offset += Vector(el.offsetLeft.toDouble(), el.offsetTop.toDouble()) - element = el.offsetParent as HTMLElement? - } - return Vector(e.pageX, e.pageY) - offset - } - - fun draw() { - clear() - for (shape in shapes) { - shape.draw() - } - } - - fun clear() { - context.fillStyle = Colors.white - context.fillRect(0.0, 0.0, width.toDouble(), height.toDouble()) - } -} - -abstract class Shape() { - abstract var pos: Vector - abstract fun draw() - - // a couple of helper extension methods we'll be using in the derived classes - fun CanvasRenderingContext2D.shadowed(shadowOffset: Vector, alpha: Double, render: CanvasRenderingContext2D.() -> Unit) { - save() - shadowColor = "rgba(100, 100, 100, $alpha)" - shadowBlur = 5.0 - shadowOffsetX = shadowOffset.x - shadowOffsetY = shadowOffset.y - render() - restore() - } - - fun CanvasRenderingContext2D.fillPath(constructPath: CanvasRenderingContext2D.() -> Unit) { - beginPath() - constructPath() - closePath() - fill() - } - -} - -class Vector(val x: Double = 0.0, val y: Double = 0.0) { - operator fun plus(v: Vector) = v(x + v.x, y + v.y) - operator fun minus(v: Vector) = v(x - v.x, y - v.y) - operator fun times(koef: Double) = v(x * koef, y * koef) - fun distanceTo(v: Vector) = sqrt((this - v).sqr) - fun rotatedBy(theta: Double): Vector { - val sin = sin(theta) - val cos = cos(theta) - return v(x * cos - y * sin, x * sin + y * cos) - } - - fun isInRect(topLeft: Vector, size: Vector) = (x >= topLeft.x) && (x <= topLeft.x + size.x) && - (y >= topLeft.y) && (y <= topLeft.y + size.y) - - val sqr: Double - get() = x * x + y * y - val normalized: Vector - get() = this * (1.0 / sqrt(sqr)) -} - diff --git a/libraries/stdlib/api/js-v1/jquery.kt b/libraries/stdlib/api/js-v1/jquery.kt deleted file mode 100644 index 611e2226ef3..00000000000 --- a/libraries/stdlib/api/js-v1/jquery.kt +++ /dev/null @@ -1,104 +0,0 @@ -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(callback: () -> kotlin.Unit): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(obj: jquery.JQuery): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(selector: kotlin.String): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(selector: kotlin.String, context: org.w3c.dom.Element): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(el: org.w3c.dom.Element): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public final external class JQuery { - public constructor JQuery() - - public final fun addClass(f: (kotlin.Int, kotlin.String) -> kotlin.String): jquery.JQuery - - public final fun addClass(className: kotlin.String): jquery.JQuery - - public final fun append(str: kotlin.String): jquery.JQuery - - public final fun attr(attrName: kotlin.String): kotlin.String - - public final fun attr(attrName: kotlin.String, value: kotlin.String): jquery.JQuery - - public final fun change(handler: () -> kotlin.Unit): jquery.JQuery - - public final fun click(): jquery.JQuery - - public final fun click(handler: (jquery.MouseClickEvent) -> kotlin.Unit): jquery.JQuery - - public final fun dblclick(handler: (jquery.MouseClickEvent) -> kotlin.Unit): jquery.JQuery - - public final fun hasClass(className: kotlin.String): kotlin.Boolean - - public final fun height(): kotlin.Number - - public final fun hover(handlerInOut: () -> kotlin.Unit): jquery.JQuery - - public final fun hover(handlerIn: () -> kotlin.Unit, handlerOut: () -> kotlin.Unit): jquery.JQuery - - public final fun html(): kotlin.String - - public final fun html(f: (kotlin.Int, kotlin.String) -> kotlin.String): jquery.JQuery - - public final fun html(s: kotlin.String): jquery.JQuery - - public final fun load(handler: () -> kotlin.Unit): jquery.JQuery - - public final fun mousedown(handler: (jquery.MouseEvent) -> kotlin.Unit): jquery.JQuery - - public final fun mousemove(handler: (jquery.MouseEvent) -> kotlin.Unit): jquery.JQuery - - public final fun mouseup(handler: (jquery.MouseEvent) -> kotlin.Unit): jquery.JQuery - - public final fun next(): jquery.JQuery - - public final fun parent(): jquery.JQuery - - public final fun ready(handler: () -> kotlin.Unit): jquery.JQuery - - public final fun removeClass(className: kotlin.String): jquery.JQuery - - public final fun slideUp(): jquery.JQuery - - public final fun text(text: kotlin.String): jquery.JQuery - - public final fun `val`(): kotlin.String? - - public final fun width(): kotlin.Number -} - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public final external class MouseClickEvent : jquery.MouseEvent { - public constructor MouseClickEvent() - - public final val which: kotlin.Int { get; } -} - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public open external class MouseEvent { - public constructor MouseEvent() - - public final val pageX: kotlin.Double { get; } - - public final val pageY: kotlin.Double { get; } - - public final fun isDefaultPrevented(): kotlin.Boolean - - public final fun preventDefault(): kotlin.Unit -} \ No newline at end of file diff --git a/libraries/stdlib/api/js-v1/jquery.ui.kt b/libraries/stdlib/api/js-v1/jquery.ui.kt deleted file mode 100644 index b8f6f06cbc1..00000000000 --- a/libraries/stdlib/api/js-v1/jquery.ui.kt +++ /dev/null @@ -1,29 +0,0 @@ -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.accordion(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.button(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.buttonset(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(mode: kotlin.String): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(mode: kotlin.String, param: kotlin.String): kotlin.Any? - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(mode: kotlin.String, param: kotlin.String, value: kotlin.Any?): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(params: kotlin.js.Json): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.draggable(params: kotlin.js.Json): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.selectable(): jquery.JQuery \ No newline at end of file diff --git a/libraries/stdlib/api/js/jquery.kt b/libraries/stdlib/api/js/jquery.kt deleted file mode 100644 index 611e2226ef3..00000000000 --- a/libraries/stdlib/api/js/jquery.kt +++ /dev/null @@ -1,104 +0,0 @@ -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(callback: () -> kotlin.Unit): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(obj: jquery.JQuery): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(selector: kotlin.String): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(selector: kotlin.String, context: org.w3c.dom.Element): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -@kotlin.js.JsName(name = "$") -public external fun jq(el: org.w3c.dom.Element): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public final external class JQuery { - public constructor JQuery() - - public final fun addClass(f: (kotlin.Int, kotlin.String) -> kotlin.String): jquery.JQuery - - public final fun addClass(className: kotlin.String): jquery.JQuery - - public final fun append(str: kotlin.String): jquery.JQuery - - public final fun attr(attrName: kotlin.String): kotlin.String - - public final fun attr(attrName: kotlin.String, value: kotlin.String): jquery.JQuery - - public final fun change(handler: () -> kotlin.Unit): jquery.JQuery - - public final fun click(): jquery.JQuery - - public final fun click(handler: (jquery.MouseClickEvent) -> kotlin.Unit): jquery.JQuery - - public final fun dblclick(handler: (jquery.MouseClickEvent) -> kotlin.Unit): jquery.JQuery - - public final fun hasClass(className: kotlin.String): kotlin.Boolean - - public final fun height(): kotlin.Number - - public final fun hover(handlerInOut: () -> kotlin.Unit): jquery.JQuery - - public final fun hover(handlerIn: () -> kotlin.Unit, handlerOut: () -> kotlin.Unit): jquery.JQuery - - public final fun html(): kotlin.String - - public final fun html(f: (kotlin.Int, kotlin.String) -> kotlin.String): jquery.JQuery - - public final fun html(s: kotlin.String): jquery.JQuery - - public final fun load(handler: () -> kotlin.Unit): jquery.JQuery - - public final fun mousedown(handler: (jquery.MouseEvent) -> kotlin.Unit): jquery.JQuery - - public final fun mousemove(handler: (jquery.MouseEvent) -> kotlin.Unit): jquery.JQuery - - public final fun mouseup(handler: (jquery.MouseEvent) -> kotlin.Unit): jquery.JQuery - - public final fun next(): jquery.JQuery - - public final fun parent(): jquery.JQuery - - public final fun ready(handler: () -> kotlin.Unit): jquery.JQuery - - public final fun removeClass(className: kotlin.String): jquery.JQuery - - public final fun slideUp(): jquery.JQuery - - public final fun text(text: kotlin.String): jquery.JQuery - - public final fun `val`(): kotlin.String? - - public final fun width(): kotlin.Number -} - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public final external class MouseClickEvent : jquery.MouseEvent { - public constructor MouseClickEvent() - - public final val which: kotlin.Int { get; } -} - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public open external class MouseEvent { - public constructor MouseEvent() - - public final val pageX: kotlin.Double { get; } - - public final val pageY: kotlin.Double { get; } - - public final fun isDefaultPrevented(): kotlin.Boolean - - public final fun preventDefault(): kotlin.Unit -} \ No newline at end of file diff --git a/libraries/stdlib/api/js/jquery.ui.kt b/libraries/stdlib/api/js/jquery.ui.kt deleted file mode 100644 index b8f6f06cbc1..00000000000 --- a/libraries/stdlib/api/js/jquery.ui.kt +++ /dev/null @@ -1,29 +0,0 @@ -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.accordion(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.button(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.buttonset(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(mode: kotlin.String): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(mode: kotlin.String, param: kotlin.String): kotlin.Any? - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(mode: kotlin.String, param: kotlin.String, value: kotlin.Any?): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.dialog(params: kotlin.js.Json): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.draggable(params: kotlin.js.Json): jquery.JQuery - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.") -public inline fun jquery.JQuery.selectable(): jquery.JQuery \ No newline at end of file diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts index b2f59c74311..e5e8a6ab070 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts @@ -63,7 +63,6 @@ val jsMainSources by task { val fullJsMainSources = tasks.getByPath(":kotlin-stdlib-js-ir:jsMainSources") exclude( listOf( - "libraries/stdlib/js/src/jquery/**", "libraries/stdlib/js/src/org.w3c/**", "libraries/stdlib/js/src/kotlin/char.kt", "libraries/stdlib/js/src/kotlin/collections.kt", diff --git a/libraries/stdlib/js/src/jquery/common.kt b/libraries/stdlib/js/src/jquery/common.kt deleted file mode 100644 index 02e15e66f12..00000000000 --- a/libraries/stdlib/js/src/jquery/common.kt +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file: Suppress("DEPRECATION_ERROR") -package jquery - -import org.w3c.dom.Element - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public external class JQuery() { - public fun addClass(className: String): JQuery - public fun addClass(f: (Int, String) -> String): JQuery - - public fun attr(attrName: String): String - public fun attr(attrName: String, value: String): JQuery - - public fun html(): String - public fun html(s: String): JQuery - public fun html(f: (Int, String) -> String): JQuery - - - public fun hasClass(className: String): Boolean - public fun removeClass(className: String): JQuery - public fun height(): Number - public fun width(): Number - - public fun click(): JQuery - - public fun mousedown(handler: (MouseEvent) -> Unit): JQuery - public fun mouseup(handler: (MouseEvent) -> Unit): JQuery - public fun mousemove(handler: (MouseEvent) -> Unit): JQuery - - public fun dblclick(handler: (MouseClickEvent) -> Unit): JQuery - public fun click(handler: (MouseClickEvent) -> Unit): JQuery - - public fun load(handler: () -> Unit): JQuery - public fun change(handler: () -> Unit): JQuery - - public fun append(str: String): JQuery - public fun ready(handler: () -> Unit): JQuery - public fun text(text: String): JQuery - public fun slideUp(): JQuery - public fun hover(handlerInOut: () -> Unit): JQuery - public fun hover(handlerIn: () -> Unit, handlerOut: () -> Unit): JQuery - public fun next(): JQuery - public fun parent(): JQuery - public fun `val`(): String? -} - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -open public external class MouseEvent() { - public val pageX: Double - public val pageY: Double - public fun preventDefault() - public fun isDefaultPrevented(): Boolean -} - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public external class MouseClickEvent() : MouseEvent { - public val which: Int -} - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -@JsName("$") -public external fun jq(selector: String): JQuery -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -@JsName("$") -public external fun jq(selector: String, context: Element): JQuery -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -@JsName("$") -public external fun jq(callback: () -> Unit): JQuery -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -@JsName("$") -public external fun jq(obj: JQuery): JQuery -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -@JsName("$") -public external fun jq(el: Element): JQuery -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -@JsName("$") -public external fun jq(): JQuery diff --git a/libraries/stdlib/js/src/jquery/ui.kt b/libraries/stdlib/js/src/jquery/ui.kt deleted file mode 100644 index 9a8c0c92ed9..00000000000 --- a/libraries/stdlib/js/src/jquery/ui.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file: Suppress("DEPRECATION_ERROR") -package jquery.ui - - -//jquery UI -import jquery.JQuery -import kotlin.js.Json - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.buttonset(): JQuery = asDynamic().buttonset() - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.dialog(): JQuery = asDynamic().dialog() - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.dialog(params: Json): JQuery = asDynamic().dialog(params) - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.dialog(mode: String, param: String): Any? = asDynamic().dialog(mode, param) - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.dialog(mode: String): JQuery = asDynamic().dialog(mode) - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.dialog(mode: String, param: String, value: Any?): JQuery = asDynamic().dialog(mode, param, value) - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.button(): JQuery = asDynamic().button() - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.accordion(): JQuery = asDynamic().accordion() - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.draggable(params: Json): JQuery = asDynamic().draggable(params) - -@Deprecated("Use declarations from 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/js-externals/kotlin/js/externals/kotlin-js-jquery/' package instead.", level = DeprecationLevel.ERROR) -public inline fun JQuery.selectable(): JQuery = asDynamic().selectable()