From 0da2f297fdb0642b7c2cee4205aaf28f67e99f8b Mon Sep 17 00:00:00 2001 From: hshristov Date: Thu, 16 Jul 2015 01:40:56 +0300 Subject: [PATCH] Fix tslint errors --- apps/tests/pages/page9.ts | 5 ++--- ui/frame/frame-common.ts | 2 +- ui/frame/frame.android.ts | 1 - ui/layouts/dock-layout/dock-layout.android.ts | 2 +- ui/layouts/grid-layout/grid-layout-common.ts | 2 -- ui/layouts/grid-layout/grid-layout.android.ts | 7 +------ ui/layouts/layout.android.ts | 1 - ui/layouts/layout.d.ts | 1 - ui/layouts/wrap-layout/wrap-layout.ios.ts | 2 -- ui/styling/stylers.android.ts | 4 ++-- 10 files changed, 7 insertions(+), 20 deletions(-) diff --git a/apps/tests/pages/page9.ts b/apps/tests/pages/page9.ts index 80cdf5741..d11d66d91 100644 --- a/apps/tests/pages/page9.ts +++ b/apps/tests/pages/page9.ts @@ -1,10 +1,9 @@ import pages = require("ui/page"); -import slider = require("ui/slider"); import imageSource = require("image-source"); import gridModule = require("ui/layouts/grid-layout"); import enums = require("ui/enums"); import img = require("ui/image"); -var Image = img.Image; + export function createPage() { var grid = new gridModule.GridLayout(); @@ -14,7 +13,7 @@ export function createPage() { grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto)); grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.star)); - var image = new Image(); + var image = new img.Image(); image.stretch = enums.Stretch.fill; image.verticalAlignment = enums.VerticalAlignment.bottom; image.horizontalAlignment = enums.HorizontalAlignment.center; diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts index 9d9c494c7..a7ba3a303 100644 --- a/ui/frame/frame-common.ts +++ b/ui/frame/frame-common.ts @@ -5,7 +5,7 @@ import types = require("utils/types"); import trace = require("trace"); import builder = require("ui/builder"); import fs = require("file-system"); -import utils = require("utils/utils"); +import platform = require("platform"); import fileResolverModule = require("file-system/file-name-resolver"); var frameStack: Array = []; diff --git a/ui/frame/frame.android.ts b/ui/frame/frame.android.ts index e0e8f7c01..68a9e4339 100644 --- a/ui/frame/frame.android.ts +++ b/ui/frame/frame.android.ts @@ -4,7 +4,6 @@ import pages = require("ui/page"); import trace = require("trace"); import observable = require("data/observable"); import utils = require("utils/utils"); -import view = require("ui/core/view"); import application = require("application"); global.moduleMerge(frameCommon, exports); diff --git a/ui/layouts/dock-layout/dock-layout.android.ts b/ui/layouts/dock-layout/dock-layout.android.ts index 42dee5c4e..b1f20f439 100644 --- a/ui/layouts/dock-layout/dock-layout.android.ts +++ b/ui/layouts/dock-layout/dock-layout.android.ts @@ -43,7 +43,7 @@ function setNativeDockProperty(data: dependencyObservable.PropertyChangeData) { (common.DockLayout.dockProperty.metadata).onSetNativeValue = setNativeDockProperty; -export class DockLayout extends common.DockLayout { +export class DockLayout extends common.DockLayout implements definition.DockLayout { static setNativeStretchLastChildProperty(data: dependencyObservable.PropertyChangeData) { var dockLayout = data.object; diff --git a/ui/layouts/grid-layout/grid-layout-common.ts b/ui/layouts/grid-layout/grid-layout-common.ts index 7c2c1a6b3..02265b28a 100644 --- a/ui/layouts/grid-layout/grid-layout-common.ts +++ b/ui/layouts/grid-layout/grid-layout-common.ts @@ -1,8 +1,6 @@ import layouts = require("ui/layouts/layout-base"); import definition = require("ui/layouts/grid-layout"); -import utils = require("utils/utils"); import dependencyObservable = require("ui/core/dependency-observable"); -import enums = require("ui/enums"); import view = require("ui/core/view"); import bindable = require("ui/core/bindable"); import types = require("utils/types"); diff --git a/ui/layouts/grid-layout/grid-layout.android.ts b/ui/layouts/grid-layout/grid-layout.android.ts index c420b1725..57d50c866 100644 --- a/ui/layouts/grid-layout/grid-layout.android.ts +++ b/ui/layouts/grid-layout/grid-layout.android.ts @@ -1,10 +1,6 @@ -import definition = require("ui/layouts/grid-layout"); -import utils = require("utils/utils"); +import utils = require("utils/utils"); import dependencyObservable = require("ui/core/dependency-observable"); -import enums = require("ui/enums"); import view = require("ui/core/view"); -import bindable = require("ui/core/bindable"); -import types = require("utils/types"); import proxy = require("ui/core/proxy"); import common = require("ui/layouts/grid-layout/grid-layout-common"); @@ -12,7 +8,6 @@ import common = require("ui/layouts/grid-layout/grid-layout-common"); declare var exports; require("utils/module-merge").merge(common, exports); - function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) { var uiView = data.object; diff --git a/ui/layouts/layout.android.ts b/ui/layouts/layout.android.ts index ef95d1f44..f0ac1f3b7 100644 --- a/ui/layouts/layout.android.ts +++ b/ui/layouts/layout.android.ts @@ -3,7 +3,6 @@ import view = require("ui/core/view"); import layoutBase = require("ui/layouts/layout-base"); import trace = require("trace"); import utils = require("utils/utils"); -import proxy = require("ui/core/proxy"); var OWNER = "_owner"; diff --git a/ui/layouts/layout.d.ts b/ui/layouts/layout.d.ts index 011f74b9c..42bb4b9b9 100644 --- a/ui/layouts/layout.d.ts +++ b/ui/layouts/layout.d.ts @@ -1,5 +1,4 @@ declare module "ui/layouts/layout" { - import view = require("ui/core/view"); import layoutBase = require("ui/layouts/layout-base"); /** diff --git a/ui/layouts/wrap-layout/wrap-layout.ios.ts b/ui/layouts/wrap-layout/wrap-layout.ios.ts index ce70f661c..de01466fd 100644 --- a/ui/layouts/wrap-layout/wrap-layout.ios.ts +++ b/ui/layouts/wrap-layout/wrap-layout.ios.ts @@ -1,8 +1,6 @@ import utils = require("utils/utils"); import view = require("ui/core/view"); import enums = require("ui/enums"); -import dependencyObservable = require("ui/core/dependency-observable"); -import proxy = require("ui/core/proxy"); import common = require("ui/layouts/wrap-layout/wrap-layout-common"); // merge the exports of the common file with the exports of this file diff --git a/ui/styling/stylers.android.ts b/ui/styling/stylers.android.ts index 255383254..15535c06f 100644 --- a/ui/styling/stylers.android.ts +++ b/ui/styling/stylers.android.ts @@ -477,8 +477,8 @@ export class LayoutBaseStyler implements definition.stylers.Styler { public static registerHandlers() { style.registerHandler(style.nativePaddingsProperty, new stylersCommon.StylePropertyChangedHandler( - LayoutStyler.setPaddingNativeProperty, - LayoutStyler.resetPaddingNativeProperty), "Layout"); + LayoutBaseStyler.setPaddingNativeProperty, + LayoutBaseStyler.resetPaddingNativeProperty), "Layout"); } }