JS: fix Kotlin.isType for case of traits

This commit is contained in:
Alexey Andreev
2016-10-18 16:47:08 +03:00
parent 20396b0e5f
commit 38a3f4af80
+6 -1
View File
@@ -422,7 +422,7 @@
return object instanceof klass;
}
if (object.constructor != null) {
if (isTrait(klass) && object.constructor != null) {
metadata = object.constructor.$metadata$;
if (metadata != null) {
return isInheritanceFromTrait(metadata, klass);
@@ -432,6 +432,11 @@
return false;
};
function isTrait(klass) {
var metadata = klass.$metadata$;
return metadata != null && metadata.type === Kotlin.TYPE.TRAIT;
}
// TODO Store callable references for members in class
Kotlin.getCallableRefForMemberFunction = function (klass, memberName) {
return function () {