diff --git a/js/js.libraries/src/core/json.kt b/js/js.libraries/src/core/json.kt index df624aad0be..335a1eb9068 100644 --- a/js/js.libraries/src/core/json.kt +++ b/js/js.libraries/src/core/json.kt @@ -9,10 +9,10 @@ class Json() { } library("jsonSet") -fun Json.set(paramName : String, value : Any?) : Unit {} +fun Json.set(paramName : String, value : Any?) : Unit = js.noImpl library("jsonGet") -fun Json.get(paramName : String) : Any? = null +fun Json.get(paramName : String) : Any? = js.noImpl library("jsonFromTuples") -fun json(vararg pairs : Tuple2) = Json() +fun json(vararg pairs : Tuple2) : Json = js.noImpl \ No newline at end of file diff --git a/js/js.libraries/src/jquery/ui.kt b/js/js.libraries/src/jquery/ui.kt index ffccbe1f983..90a9eee8f9e 100644 --- a/js/js.libraries/src/jquery/ui.kt +++ b/js/js.libraries/src/jquery/ui.kt @@ -11,6 +11,12 @@ fun JQuery.buttonset() : JQuery = js.noImpl; native fun JQuery.dialog() : JQuery = js.noImpl; native +fun JQuery.dialog(params : Json) : JQuery = js.noImpl +native +fun JQuery.dialog(mode : String, param : String) : Any? = js.noImpl +native +fun JQuery.dialog(mode : String, param : String, value : Any?) : JQuery = js.noImpl +native fun JQuery.button() : JQuery = js.noImpl; native fun JQuery.accordion() : JQuery = js.noImpl diff --git a/js/js.translator/testFiles/kotlin_lib.js b/js/js.translator/testFiles/kotlin_lib.js index 68834e5bf3b..66d36df1ee1 100644 --- a/js/js.translator/testFiles/kotlin_lib.js +++ b/js/js.translator/testFiles/kotlin_lib.js @@ -594,6 +594,7 @@ var Kotlin; return res; }; + //TODO: use intrinsic Kotlin.jsonSet = function (obj, attrName, value) { obj[attrName] = value; }; @@ -603,6 +604,16 @@ var Kotlin; }; + Kotlin.jsonAddProperties = function (obj1, obj2) { + for (var p in obj2) { + if (obj2.hasOwnProperty(p)) { + obj1[p] = obj2[p]; + } + } + return obj1; + }; + + //TODO: use intrinsic Kotlin.sure = function (obj) { return obj; };