From 899ce1adc83a286c87bfcf920ccf4c9df9986a98 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Fri, 6 Jan 2017 14:57:21 +0200 Subject: [PATCH] fix placeholder imports (#3429) --- tests/app/TKUnit.ts | 2 +- tests/app/testRunner.ts | 2 +- tns-core-modules/ui/placeholder/placeholder-common.ts | 1 - tns-core-modules/ui/placeholder/placeholder.android.ts | 3 ++- tns-core-modules/ui/placeholder/placeholder.ios.ts | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 tns-core-modules/ui/placeholder/placeholder-common.ts diff --git a/tests/app/TKUnit.ts b/tests/app/TKUnit.ts index 66c3a725c..362c49182 100644 --- a/tests/app/TKUnit.ts +++ b/tests/app/TKUnit.ts @@ -49,7 +49,7 @@ export var write = function write(message: string, type?: number) { var runTest = function (testInfo: TestInfoEntry) { let start = time(); - let duration: number; + let duration; try { if (testInfo.instance) { testInfo.testFunc.apply(testInfo.instance); diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts index 1aca79ab0..52ce05463 100644 --- a/tests/app/testRunner.ts +++ b/tests/app/testRunner.ts @@ -80,7 +80,7 @@ allTests["TAB-VIEW"] = require("./ui/tab-view/tab-view-tests"); allTests["SLIDER"] = require("./ui/slider/slider-tests"); allTests["SWITCH"] = require("./ui/switch/switch-tests"); allTests["PROGRESS"] = require("./ui/progress/progress-tests"); -// allTests["PLACEHOLDER"] = require("./ui/placeholder/placeholder-tests"); +allTests["PLACEHOLDER"] = require("./ui/placeholder/placeholder-tests"); // allTests["PAGE"] = require("./ui/page/page-tests"); // allTests["LISTVIEW"] = require("./ui/list-view/list-view-tests"); // allTests["ACTIVITY-INDICATOR"] = require("./ui/activity-indicator/activity-indicator-tests"); diff --git a/tns-core-modules/ui/placeholder/placeholder-common.ts b/tns-core-modules/ui/placeholder/placeholder-common.ts deleted file mode 100644 index 5f282702b..000000000 --- a/tns-core-modules/ui/placeholder/placeholder-common.ts +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tns-core-modules/ui/placeholder/placeholder.android.ts b/tns-core-modules/ui/placeholder/placeholder.android.ts index e830a1b39..95e64f134 100644 --- a/tns-core-modules/ui/placeholder/placeholder.android.ts +++ b/tns-core-modules/ui/placeholder/placeholder.android.ts @@ -1,6 +1,7 @@ import { Placeholder as PlaceholderDefinition, CreateViewEventData } from "ui/placeholder" +import { View } from "ui/core/view" -export class Placeholder extends PlaceholderDefinition { +export class Placeholder extends View implements PlaceholderDefinition { public static creatingViewEvent = "creatingView"; private _android: android.view.View; diff --git a/tns-core-modules/ui/placeholder/placeholder.ios.ts b/tns-core-modules/ui/placeholder/placeholder.ios.ts index 8dde45932..6c47d6696 100644 --- a/tns-core-modules/ui/placeholder/placeholder.ios.ts +++ b/tns-core-modules/ui/placeholder/placeholder.ios.ts @@ -1,6 +1,7 @@ import { Placeholder as PlaceholderDefinition, CreateViewEventData } from "ui/placeholder" +import { View } from "ui/core/view" -export class Placeholder extends PlaceholderDefinition { +export class Placeholder extends View implements PlaceholderDefinition { public static creatingViewEvent = "creatingView"; private _ios: UIView;