From 398457c5282ccba16f620d5220e2b98c0b0e3edf Mon Sep 17 00:00:00 2001 From: Vladimir Mutafov Date: Fri, 21 Feb 2020 18:13:48 +0200 Subject: [PATCH 1/2] feat: Add .kt extension to known extensions map (#8363) --- nativescript-core/globals/register-module-helpers.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/nativescript-core/globals/register-module-helpers.ts b/nativescript-core/globals/register-module-helpers.ts index 79242b71e..0d76c6c9d 100644 --- a/nativescript-core/globals/register-module-helpers.ts +++ b/nativescript-core/globals/register-module-helpers.ts @@ -14,6 +14,7 @@ const modulesLoadedForUI = new Set(); const defaultExtensionMap: ExtensionMap = { ".js": ".js", ".ts": ".js", + ".kt": ".js", ".css": ".css", ".scss": ".css", ".less": ".css", From 06b9ecf80b31383e73bc6c712a94b91c3f7e54ec Mon Sep 17 00:00:00 2001 From: Darin Dimitrov Date: Sun, 23 Feb 2020 17:46:01 +0200 Subject: [PATCH 2/2] fix(ios): Ensure ObserverClass is initialized (#8365) --- .../ui/core/control-state-change/control-state-change.ios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nativescript-core/ui/core/control-state-change/control-state-change.ios.ts b/nativescript-core/ui/core/control-state-change/control-state-change.ios.ts index e903adebf..4b4f27b3e 100644 --- a/nativescript-core/ui/core/control-state-change/control-state-change.ios.ts +++ b/nativescript-core/ui/core/control-state-change/control-state-change.ios.ts @@ -22,7 +22,7 @@ export class ControlStateChangeListener implements ControlStateChangeListenerDef private _callback: (state: string) => void; constructor(control: UIControl, callback: (state: string) => void) { - this._observer = ObserverClass.alloc(); + this._observer = ObserverClass.alloc().init(); this._observer["_owner"] = this; this._control = control; this._callback = callback;