From 3ef7805cd6772aaadd99f8ea00bd0bd745ba2c8d Mon Sep 17 00:00:00 2001 From: pTalanov Date: Sun, 11 Mar 2012 22:37:53 +0400 Subject: [PATCH] Native api update. --- js/js.libraries/src/core/core.kt | 3 ++- js/js.libraries/src/core/debug.kt | 11 +++++++++++ js/js.libraries/src/core/json.kt | 3 +++ js/js.libraries/src/core/math.kt | 2 +- js/js.libraries/src/jquery/common.kt | 1 + 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 js/js.libraries/src/core/debug.kt diff --git a/js/js.libraries/src/core/core.kt b/js/js.libraries/src/core/core.kt index 8335ca4fa2b..9eb716958b3 100644 --- a/js/js.libraries/src/core/core.kt +++ b/js/js.libraries/src/core/core.kt @@ -16,8 +16,9 @@ library("println") fun println(s : Any?) {} library("print") fun print(s : Any?) {} +//TODO: consistent parseInt library("parseInt") -fun parseInt(s : String) : Int = 0 +fun parseInt(s : String) : Int = js.noImpl library open class Exception() : Throwable() {} library diff --git a/js/js.libraries/src/core/debug.kt b/js/js.libraries/src/core/debug.kt new file mode 100644 index 00000000000..54000cc79b6 --- /dev/null +++ b/js/js.libraries/src/core/debug.kt @@ -0,0 +1,11 @@ +package js.debug + +import js.* + +native +val console : consoleClass = js.noImpl + +native +class consoleClass() { + fun log(message : Any?) : Unit = js.noImpl +} \ No newline at end of file diff --git a/js/js.libraries/src/core/json.kt b/js/js.libraries/src/core/json.kt index 5c9a56dbed9..4b6429da4ae 100644 --- a/js/js.libraries/src/core/json.kt +++ b/js/js.libraries/src/core/json.kt @@ -17,5 +17,8 @@ fun Json.get(paramName : String) : Any? = js.noImpl library("jsonFromTuples") fun json(vararg pairs : Tuple2) : Json = js.noImpl +library("jsonFromTuples") +fun json2(pairs : Array>) : Json = js.noImpl + library("jsonAddProperties") fun Json.add(other : Json) : Json = js.noImpl \ No newline at end of file diff --git a/js/js.libraries/src/core/math.kt b/js/js.libraries/src/core/math.kt index a652c247ed9..dc1fc9d8ec7 100644 --- a/js/js.libraries/src/core/math.kt +++ b/js/js.libraries/src/core/math.kt @@ -2,6 +2,7 @@ package js; import js.native +//TODO: declare using number native class MathClass() { val PI : Double = 1.0; @@ -25,7 +26,6 @@ class MathClass() { fun round(value : Number) = 0 fun floor(value : Number) = 0 fun ceil(value : Number) = 0 - } native diff --git a/js/js.libraries/src/jquery/common.kt b/js/js.libraries/src/jquery/common.kt index 54ad3feb9dd..13ea693adc8 100644 --- a/js/js.libraries/src/jquery/common.kt +++ b/js/js.libraries/src/jquery/common.kt @@ -41,6 +41,7 @@ class JQuery() { fun hover(handlerIn : DomElement.() -> Unit, handlerOut : DomElement.() -> Unit) = this; fun next() : JQuery = js.noImpl fun parent() : JQuery = js.noImpl + fun `val`() : String? = js.noImpl } native