From ca201cf9d716234cdf8bd3c74a500e2c7275a91d Mon Sep 17 00:00:00 2001 From: hshristov Date: Mon, 7 Apr 2014 13:48:36 +0300 Subject: [PATCH] Fixed iOS BCL to use properties instead of methods. Fixed web_client to call .toString() on NSString Fixed BCL project to use version 1.0 --- Application/application.ios.ts | 6 +++--- BCL.csproj | 2 +- Image/image.ios.ts | 4 ++-- WebClient/web_client.ios.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/application.ios.ts b/Application/application.ios.ts index d50668f9e..ce3d49836 100644 --- a/Application/application.ios.ts +++ b/Application/application.ios.ts @@ -56,14 +56,14 @@ export module tk { applicationDidFinishLaunchingWithOptions: function () { log("Application launched: applicationDidFinishLaunchingWithOptions."); - this.window = new UIKit.UIWindow(UIKit.UIScreen.mainScreen().bounds()); - this.window.setBackgroundColor(UIKit.UIColor.whiteColor()); + this.window = new UIKit.UIWindow(UIKit.UIScreen.mainScreen().bounds); + this.window.backgroundColor = UIKit.UIColor.whiteColor(); var iosApp = currentApp.ios; //this.window.setRootViewController(iosApp.rootController); if (currentApp.onLaunch) { - this.window.setRootViewController(currentApp.onLaunch()); + this.window.rootViewController = currentApp.onLaunch(); } else { log("Missing TK.UI.Application.current.onLaunch"); } diff --git a/BCL.csproj b/BCL.csproj index 6a1aeeb6e..06c4ab108 100644 --- a/BCL.csproj +++ b/BCL.csproj @@ -9,7 +9,7 @@ v4.5 full true - 0.9 + 1.0 true diff --git a/Image/image.ios.ts b/Image/image.ios.ts index 8d130e45b..dfaf8497a 100644 --- a/Image/image.ios.ts +++ b/Image/image.ios.ts @@ -51,10 +51,10 @@ export class Image { } public getHeight(): number { - return (this.ios) ? this.ios.size().height : NaN; + return (this.ios) ? this.ios.size.height : NaN; } public getWidth(): number { - return (this.ios) ? this.ios.size().width : NaN; + return (this.ios) ? this.ios.size.width : NaN; } } \ No newline at end of file diff --git a/WebClient/web_client.ios.ts b/WebClient/web_client.ios.ts index ff92bb043..5a2023771 100644 --- a/WebClient/web_client.ios.ts +++ b/WebClient/web_client.ios.ts @@ -12,7 +12,7 @@ export class Client { try { Client.get(url, function (data) { if (successCallback) { - successCallback(Foundation.NSString.initWithDataEncoding(data, 4)); + successCallback(Foundation.NSString.initWithDataEncoding(data, 4).toString()); } }, errorCallback); } catch (ex) {