azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS backend: STDLib: remove base class parameter from API

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-08-29 22:18:13 +04:00
parent 4c57d70be9
commit 0fbce55df7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testFiles/kotlin_lib_ecma5.js
+7 -5
View File
@@ -159,8 +159,9 @@ var KotlinNew = {};
}; };
} }
// bases - array, @NotNull, baseClass - _.foo.B, @Nullable // bases - array, @Nullable, baseClass - _.foo.B, @Nullable
KotlinNew.createClass = function (bases, baseClass, initializer, functions, staticProperties) { KotlinNew.createClass = function (bases, initializer, functions, staticProperties) {
var baseClass = KotlinNew.Util.getClass(bases);
var constr = createConstructor(); var constr = createConstructor();
var basePrototypeObj; var basePrototypeObj;
var baseInitializer; var baseInitializer;
@@ -184,7 +185,8 @@ var KotlinNew = {};
return constr; return constr;
}; };
KotlinNew.createObject = function (bases, baseClass, initializer, functions) { KotlinNew.createObject = function (bases, initializer, functions) {
var baseClass = KotlinNew.Util.getClass(bases);
var basePrototypeObj; var basePrototypeObj;
var baseInitializer; var baseInitializer;
if (!nullOrUndefined(baseClass)) { if (!nullOrUndefined(baseClass)) {
@@ -296,12 +298,12 @@ var Kotlin = Object.create(null);
}; };
Kotlin.createClass = function (bases, initializer, properties, staticProperties) { Kotlin.createClass = function (bases, initializer, properties, staticProperties) {
return KotlinNew.createClass(bases, KotlinNew.Util.getClass(bases), initializer, propertyDescriptorConverter(properties), propertyDescriptorConverter(staticProperties)); return KotlinNew.createClass(bases, initializer, propertyDescriptorConverter(properties), propertyDescriptorConverter(staticProperties));
}; };
Kotlin.createObject = function (bases, initializer, properties) { Kotlin.createObject = function (bases, initializer, properties) {
return KotlinNew.createObject(bases, KotlinNew.Util.getClass(bases), initializer, propertyDescriptorConverter(properties)) return KotlinNew.createObject(bases, initializer, propertyDescriptorConverter(properties))
}; };
Kotlin.definePackage = function (initializer, members) { Kotlin.definePackage = function (initializer, members) {