Update API.

This commit is contained in:
pTalanov
2012-03-10 17:32:53 +04:00
parent 57dcb991b2
commit dac63773ce
3 changed files with 20 additions and 3 deletions
+3 -3
View File
@@ -9,10 +9,10 @@ class Json() {
} }
library("jsonSet") library("jsonSet")
fun Json.set(paramName : String, value : Any?) : Unit {} fun Json.set(paramName : String, value : Any?) : Unit = js.noImpl
library("jsonGet") library("jsonGet")
fun Json.get(paramName : String) : Any? = null fun Json.get(paramName : String) : Any? = js.noImpl
library("jsonFromTuples") library("jsonFromTuples")
fun json(vararg pairs : Tuple2<String, Any?>) = Json() fun json(vararg pairs : Tuple2<String, Any?>) : Json = js.noImpl
+6
View File
@@ -11,6 +11,12 @@ fun JQuery.buttonset() : JQuery = js.noImpl;
native native
fun JQuery.dialog() : JQuery = js.noImpl; fun JQuery.dialog() : JQuery = js.noImpl;
native 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; fun JQuery.button() : JQuery = js.noImpl;
native native
fun JQuery.accordion() : JQuery = js.noImpl fun JQuery.accordion() : JQuery = js.noImpl
+11
View File
@@ -594,6 +594,7 @@ var Kotlin;
return res; return res;
}; };
//TODO: use intrinsic
Kotlin.jsonSet = function (obj, attrName, value) { Kotlin.jsonSet = function (obj, attrName, value) {
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) { Kotlin.sure = function (obj) {
return obj; return obj;
}; };