JS backend: minor fixes in k2js stdlib.

This commit is contained in:
Zalim Bashorov
2013-11-14 16:30:00 +04:00
parent dd44478c2f
commit cf717f8cb7
6 changed files with 614 additions and 603 deletions
+1 -1
View File
@@ -11,5 +11,5 @@ import org.w3c.dom.views.*
*/
public trait EventListener {
public fun handleEvent(arg1: Event?): Unit = js.noImpl
public fun handleEvent(arg1: Event?): Unit
}
File diff suppressed because it is too large Load Diff
+11 -1
View File
@@ -5,23 +5,33 @@ import java.util.*
library("comparator")
public fun comparator<T>(f : (T, T) -> Int): Comparator<T> = js.noImpl
public fun <T> array(vararg value: T): Array<T> = js.noImpl
library
public fun <T> array(vararg value : T): Array<T> = js.noImpl
// "constructors" for primitive types array
library
public fun doubleArray(vararg content : Double): DoubleArray = js.noImpl
library
public fun floatArray(vararg content : Float): FloatArray = js.noImpl
library
public fun longArray(vararg content : Long): LongArray = js.noImpl
library
public fun intArray(vararg content : Int): IntArray = js.noImpl
library
public fun charArray(vararg content : Char): CharArray = js.noImpl
library
public fun shortArray(vararg content : Short): ShortArray = js.noImpl
library
public fun byteArray(vararg content : Byte): ByteArray = js.noImpl
library
public fun booleanArray(vararg content : Boolean): BooleanArray = js.noImpl
library("copyToArray")
+4 -2
View File
@@ -35,11 +35,13 @@ native public fun String.match(regex : String) : Array<String> = js.noImpl
native public fun String.trim() : String = js.noImpl
public val String.size: Int
get() = js.noImpl
library
public val String.size: Int = js.noImpl
library
public fun String.length(): Int = js.noImpl
library
public fun String.isEmpty(): Boolean = js.noImpl
/*
+77 -77
View File
@@ -6,97 +6,97 @@ import js.dom.html.HTMLElement
import org.w3c.dom.Element
public native trait HTMLCanvasElement : HTMLElement {
public native var width: Double = js.noImpl
public native var height: Double = js.noImpl
public native fun getContext(context: String): CanvasContext? = js.noImpl
public native fun toDataURL(string: String, args: Any): String = js.noImpl
public native fun toDataURL(): String = js.noImpl
public native fun toDataURL(string: String): String = js.noImpl
public native var width: Double
public native var height: Double
public native fun getContext(context: String): CanvasContext?
public native fun toDataURL(string: String, args: Any): String
public native fun toDataURL(): String
public native fun toDataURL(string: String): String
}
public native trait CanvasContext {
public native var canvas: HTMLCanvasElement = js.noImpl
public native fun save(): Unit = js.noImpl
public native fun restore(): Unit = js.noImpl
public native fun scale(x: Number, y: Number): Unit = js.noImpl
public native fun rotate(angle: Number): Unit = js.noImpl
public native fun translate(x: Number, y: Number): Unit = js.noImpl
public native fun transform(m11: Number, m12: Number, m21: Number, m22: Number, dx: Number, dy: Number): Unit = js.noImpl
public native fun setTransform(m11: Number, m12: Number, m21: Number, m22: Number, dx: Number, dy: Number): Unit = js.noImpl
public native var globalAlpha: Double = js.noImpl
public native var globalCompositeOperation: String = js.noImpl
public native var fillStyle: Any = js.noImpl
public native var strokeStyle: Any = js.noImpl
public native fun createLinearGradient(x0: Number, y0: Number, x1: Number, y1: Number): CanvasGradient? = js.noImpl
public native fun createRadialGradient(x0: Number, y0: Number, r0: Number, x1: Number, y1: Number, r1: Number): CanvasGradient? = js.noImpl
public native var lineWidth: Double = js.noImpl
public native var lineCap: String = js.noImpl
public native var lineJoin: String = js.noImpl
public native var miterLimit: Double = js.noImpl
public native var shadowOffsetX: Double = js.noImpl
public native var shadowOffsetY: Double = js.noImpl
public native var shadowBlur: Double = js.noImpl
public native var shadowColor: String = js.noImpl
public native fun clearRect(x: Number, y: Number, w: Number, h: Number): Unit = js.noImpl
public native fun fillRect(x: Number, y: Number, w: Number, h: Number): Unit = js.noImpl
public native fun strokeRect(x: Number, y: Number, w: Number, h: Number): Unit = js.noImpl
public native fun beginPath(): Unit = js.noImpl
public native fun closePath(): Unit = js.noImpl
public native fun moveTo(x: Number, y: Number): Unit = js.noImpl
public native fun lineTo(x: Number, y: Number): Unit = js.noImpl
public native fun quadraticCurveTo(cpx: Number, cpy: Number, x: Number, y: Number): Unit = js.noImpl
public native fun bezierCurveTo(cp1x: Number, cp1y: Number, cp2x: Number, cp2y: Number, x: Number, y: Number): Unit = js.noImpl
public native fun arcTo(x1: Number, y1: Number, x2: Number, y2: Number, radius: Number): Unit = js.noImpl
public native fun rect(x: Number, y: Number, w: Number, h: Number): Unit = js.noImpl
public native fun arc(x: Number, y: Number, radius: Number, startAngle: Number, endAngle: Number, anticlockwise: Boolean): Unit = js.noImpl
public native fun fill(): Unit = js.noImpl
public native fun stroke(): Unit = js.noImpl
public native fun clip(): Unit = js.noImpl
public native fun isPointInPath(x: Number, y: Number): Boolean = js.noImpl
public native fun drawFocusRing(element: Element, xCaret: Number, yCaret: Number, canDrawCustom: Boolean): Unit = js.noImpl
public native fun drawFocusRing(element: Element, xCaret: Number, yCaret: Number): Unit = js.noImpl
public native var font: String = js.noImpl
public native var textAlign: String = js.noImpl
public native var textBaseline: String = js.noImpl
public native fun fillText(text: String, x: Number, y: Number, maxWidth: Number): Unit = js.noImpl
public native fun fillText(text: String, x: Number, y: Number): Unit = js.noImpl
public native fun strokeText(text: String, x: Number, y: Number, maxWidth: Number): Unit = js.noImpl
public native fun strokeText(text: String, x: Number, y: Number): Unit = js.noImpl
public native fun measureText(text: String): TextMetrics? = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number, dy: Number, dw: Number, dh: Number): Unit = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number): Unit = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number): Unit = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number): Unit = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number): Unit = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number, dy: Number): Unit = js.noImpl
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number, dy: Number, dw: Number): Unit = js.noImpl
public native fun createImageData(imagedata: ImageData, sh: Number): ImageData? = js.noImpl
public native fun createImageData(imagedata: ImageData): ImageData? = js.noImpl
public native fun createImageData(sw: Number, sh: Number): ImageData? = js.noImpl
public native fun createImageData(sw: Number): ImageData? = js.noImpl
public native fun getImageData(sx: Number, sy: Number, sw: Number, sh: Number): ImageData? = js.noImpl
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number, dirtyY: Number, dirtyWidth: Number, dirtyHeight: Number): Unit = js.noImpl
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number): Unit = js.noImpl
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number): Unit = js.noImpl
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number, dirtyY: Number): Unit = js.noImpl
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number, dirtyY: Number, dirtyWidth: Number): Unit = js.noImpl
public native var canvas: HTMLCanvasElement
public native fun save(): Unit
public native fun restore(): Unit
public native fun scale(x: Number, y: Number): Unit
public native fun rotate(angle: Number): Unit
public native fun translate(x: Number, y: Number): Unit
public native fun transform(m11: Number, m12: Number, m21: Number, m22: Number, dx: Number, dy: Number): Unit
public native fun setTransform(m11: Number, m12: Number, m21: Number, m22: Number, dx: Number, dy: Number): Unit
public native var globalAlpha: Double
public native var globalCompositeOperation: String
public native var fillStyle: Any
public native var strokeStyle: Any
public native fun createLinearGradient(x0: Number, y0: Number, x1: Number, y1: Number): CanvasGradient?
public native fun createRadialGradient(x0: Number, y0: Number, r0: Number, x1: Number, y1: Number, r1: Number): CanvasGradient?
public native var lineWidth: Double
public native var lineCap: String
public native var lineJoin: String
public native var miterLimit: Double
public native var shadowOffsetX: Double
public native var shadowOffsetY: Double
public native var shadowBlur: Double
public native var shadowColor: String
public native fun clearRect(x: Number, y: Number, w: Number, h: Number): Unit
public native fun fillRect(x: Number, y: Number, w: Number, h: Number): Unit
public native fun strokeRect(x: Number, y: Number, w: Number, h: Number): Unit
public native fun beginPath(): Unit
public native fun closePath(): Unit
public native fun moveTo(x: Number, y: Number): Unit
public native fun lineTo(x: Number, y: Number): Unit
public native fun quadraticCurveTo(cpx: Number, cpy: Number, x: Number, y: Number): Unit
public native fun bezierCurveTo(cp1x: Number, cp1y: Number, cp2x: Number, cp2y: Number, x: Number, y: Number): Unit
public native fun arcTo(x1: Number, y1: Number, x2: Number, y2: Number, radius: Number): Unit
public native fun rect(x: Number, y: Number, w: Number, h: Number): Unit
public native fun arc(x: Number, y: Number, radius: Number, startAngle: Number, endAngle: Number, anticlockwise: Boolean): Unit
public native fun fill(): Unit
public native fun stroke(): Unit
public native fun clip(): Unit
public native fun isPointInPath(x: Number, y: Number): Boolean
public native fun drawFocusRing(element: Element, xCaret: Number, yCaret: Number, canDrawCustom: Boolean): Unit
public native fun drawFocusRing(element: Element, xCaret: Number, yCaret: Number): Unit
public native var font: String
public native var textAlign: String
public native var textBaseline: String
public native fun fillText(text: String, x: Number, y: Number, maxWidth: Number): Unit
public native fun fillText(text: String, x: Number, y: Number): Unit
public native fun strokeText(text: String, x: Number, y: Number, maxWidth: Number): Unit
public native fun strokeText(text: String, x: Number, y: Number): Unit
public native fun measureText(text: String): TextMetrics?
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number, dy: Number, dw: Number, dh: Number): Unit
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number): Unit
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number): Unit
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number): Unit
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number): Unit
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number, dy: Number): Unit
public native fun drawImage(img_elem: HTMLElement, dx_or_sx: Number, dy_or_sy: Number, dw_or_sw: Number, dh_or_sh: Number, dx: Number, dy: Number, dw: Number): Unit
public native fun createImageData(imagedata: ImageData, sh: Number): ImageData?
public native fun createImageData(imagedata: ImageData): ImageData?
public native fun createImageData(sw: Number, sh: Number): ImageData?
public native fun createImageData(sw: Number): ImageData?
public native fun getImageData(sx: Number, sy: Number, sw: Number, sh: Number): ImageData?
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number, dirtyY: Number, dirtyWidth: Number, dirtyHeight: Number): Unit
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number): Unit
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number): Unit
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number, dirtyY: Number): Unit
public native fun putImageData(image_data: ImageData, dx: Number, dy: Number, dirtyX: Number, dirtyY: Number, dirtyWidth: Number): Unit
}
public native trait CanvasGradient {
public native fun addColorStop(offset: Number, color: String): Unit = js.noImpl
public native fun addColorStop(offset: Number, color: String): Unit
}
public native trait ImageData {
public native var data: CanvasPixelArray = js.noImpl
public native var width: Double = js.noImpl
public native var height: Double = js.noImpl
public native var data: CanvasPixelArray
public native var width: Double
public native var height: Double
}
public native trait CanvasPixelArray {
public native var length: Double = js.noImpl
public native var length: Double
}
public native trait TextMetrics {
public native var width: Double = js.noImpl
public native var width: Double
}
+40 -41
View File
@@ -4,69 +4,68 @@ import org.w3c.dom.Element
native
public public class JQuery() {
public fun addClass(className : String) : JQuery = js.noImpl;
public fun addClass(f : Element.(Int, String)->String) = js.noImpl;
public fun addClass(className: String): JQuery = js.noImpl;
public fun addClass(f: Element.(Int, String) -> String): JQuery = js.noImpl;
public fun attr(attrName : String) = "";
public fun attr(attrName : String, value : String) = this;
public fun attr(attrName: String): String = "";
public fun attr(attrName: String, value: String): JQuery = this;
public fun html() : String = "";
public fun html(s : String) = this;
public fun html(f : Element.(Int, String)->String) = this;
public fun html(): String = "";
public fun html(s: String): JQuery = this;
public fun html(f: Element.(Int, String) -> String): JQuery = this;
public fun hasClass(className : String) = true
public fun removeClass(className : String) = this
public fun height() = 0
public fun width() = 0
public fun hasClass(className: String): Boolean = true
public fun removeClass(className: String): JQuery = this
public fun height(): Number = 0
public fun width(): Number = 0
public fun click() = this;
public fun click(): JQuery = this;
public fun mousedown(handler : Element.(MouseEvent)->Unit) = this;
public fun mouseup(handler : Element.(MouseEvent)->Unit) = this;
public fun mousemove(handler : Element.(MouseEvent)->Unit) = this;
public fun mousedown(handler: Element.(MouseEvent) -> Unit): JQuery = this;
public fun mouseup(handler: Element.(MouseEvent) -> Unit): JQuery = this;
public fun mousemove(handler: Element.(MouseEvent) -> Unit): JQuery = this;
public fun dblclick(handler : Element.(MouseClickEvent)->Unit) = this;
public fun click(handler : Element.(MouseClickEvent)->Unit) = this;
public fun dblclick(handler: Element.(MouseClickEvent) -> Unit): JQuery = this;
public fun click(handler: Element.(MouseClickEvent) -> Unit): JQuery = this;
public fun load(handler : Element.()->Unit) = this;
public fun change(handler : Element.()->Unit) = this;
public fun load(handler: Element.() -> Unit): JQuery = this;
public fun change(handler: Element.() -> Unit): JQuery = this;
public fun append(str : String) = this;
public fun ready(handler : ()->Unit) = this;
public fun text(text : String) = this;
public fun slideUp() = this;
public fun hover(handlerInOut : Element.() -> Unit) = this;
public fun hover(handlerIn : Element.() -> Unit, handlerOut : Element.() -> Unit) = this;
public fun next() : JQuery = js.noImpl
public fun parent() : JQuery = js.noImpl
public fun `val`() : String? = js.noImpl
public fun append(str: String): JQuery = this;
public fun ready(handler: () -> Unit): JQuery = this;
public fun text(text: String): JQuery = this;
public fun slideUp(): JQuery = this;
public fun hover(handlerInOut: Element.() -> Unit): JQuery = this;
public fun hover(handlerIn: Element.() -> Unit, handlerOut: Element.() -> Unit): JQuery = this;
public fun next(): JQuery = js.noImpl
public fun parent(): JQuery = js.noImpl
public fun `val`(): String? = js.noImpl
}
native
open public class MouseEvent() {
public val pageX : Double = 0.0;
public val pageY : Double = 0.0;
public fun preventDefault() {}
public fun isDefaultPrevented() : Boolean = true;
public val pageX: Double = 0.0;
public val pageY: Double = 0.0;
public fun preventDefault() {
}
public fun isDefaultPrevented(): Boolean = true;
}
native
public class MouseClickEvent() : MouseEvent() {
val which : Int = 0;
val which: Int = 0;
}
native("$")
public fun jq(selector : String) = JQuery();
public fun jq(selector: String): JQuery = JQuery();
native("$")
public fun jq(selector : String, context : Element) = JQuery();
public fun jq(selector: String, context: Element): JQuery = JQuery();
native("$")
public fun jq(callback : () -> Unit) = JQuery();
public fun jq(callback: () -> Unit): JQuery = JQuery();
native("$")
public fun jq(obj : JQuery) = JQuery();
public fun jq(obj: JQuery): JQuery = JQuery();
native("$")
public fun jq(el : Element) = JQuery();
public fun jq(el: Element): JQuery = JQuery();
native("$")
public fun jq() = JQuery();
public fun jq(): JQuery = JQuery();