From 4c03cddbd632c6d3a8272af61da1a9c6f723c7cf Mon Sep 17 00:00:00 2001 From: hshristov Date: Mon, 3 Aug 2015 13:47:45 +0300 Subject: [PATCH] Fix tslint error Change module-merge to use the global merge function --- ui/animation/animation.android.ts | 4 +--- ui/animation/animation.ios.ts | 4 +--- ui/frame/frame-common.ts | 1 - ui/layouts/absolute-layout/absolute-layout.android.ts | 4 +--- ui/layouts/absolute-layout/absolute-layout.ios.ts | 4 +--- ui/layouts/dock-layout/dock-layout.android.ts | 4 +--- ui/layouts/dock-layout/dock-layout.ios.ts | 2 ++ ui/layouts/grid-layout/grid-layout.android.ts | 4 +--- ui/layouts/grid-layout/grid-layout.ios.ts | 4 +--- ui/layouts/stack-layout/stack-layout.android.ts | 4 +--- ui/layouts/stack-layout/stack-layout.ios.ts | 4 +--- ui/layouts/wrap-layout/wrap-layout.android.ts | 4 +--- ui/layouts/wrap-layout/wrap-layout.ios.ts | 4 +--- ui/text-view/text-view.ios.ts | 4 +--- 14 files changed, 14 insertions(+), 37 deletions(-) diff --git a/ui/animation/animation.android.ts b/ui/animation/animation.android.ts index f6245f811..906ce56ea 100644 --- a/ui/animation/animation.android.ts +++ b/ui/animation/animation.android.ts @@ -5,9 +5,7 @@ import color = require("color"); import trace = require("trace"); import types = require("utils/types"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); var floatType = java.lang.Float.class.getField("TYPE").get(null); var argbEvaluator = new android.animation.ArgbEvaluator(); diff --git a/ui/animation/animation.ios.ts b/ui/animation/animation.ios.ts index 0e278513a..e702cbde4 100644 --- a/ui/animation/animation.ios.ts +++ b/ui/animation/animation.ios.ts @@ -2,9 +2,7 @@ import common = require("ui/animation/animation-common"); import trace = require("trace"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); var _transform = "_transform"; var _skip = "_skip"; diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts index a7ba3a303..4c1851478 100644 --- a/ui/frame/frame-common.ts +++ b/ui/frame/frame-common.ts @@ -5,7 +5,6 @@ import types = require("utils/types"); import trace = require("trace"); import builder = require("ui/builder"); import fs = require("file-system"); -import platform = require("platform"); import fileResolverModule = require("file-system/file-name-resolver"); var frameStack: Array = []; diff --git a/ui/layouts/absolute-layout/absolute-layout.android.ts b/ui/layouts/absolute-layout/absolute-layout.android.ts index 4dff79878..e2ed19ff6 100644 --- a/ui/layouts/absolute-layout/absolute-layout.android.ts +++ b/ui/layouts/absolute-layout/absolute-layout.android.ts @@ -4,9 +4,7 @@ import common = require("ui/layouts/absolute-layout/absolute-layout-common"); import dependencyObservable = require("ui/core/dependency-observable"); import proxy = require("ui/core/proxy"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) { diff --git a/ui/layouts/absolute-layout/absolute-layout.ios.ts b/ui/layouts/absolute-layout/absolute-layout.ios.ts index bb150ad0a..801a6634b 100644 --- a/ui/layouts/absolute-layout/absolute-layout.ios.ts +++ b/ui/layouts/absolute-layout/absolute-layout.ios.ts @@ -2,9 +2,7 @@ import view = require("ui/core/view"); import common = require("ui/layouts/absolute-layout/absolute-layout-common"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); export class AbsoluteLayout extends common.AbsoluteLayout { diff --git a/ui/layouts/dock-layout/dock-layout.android.ts b/ui/layouts/dock-layout/dock-layout.android.ts index a31fd4422..253a9fcca 100644 --- a/ui/layouts/dock-layout/dock-layout.android.ts +++ b/ui/layouts/dock-layout/dock-layout.android.ts @@ -4,9 +4,7 @@ import enums = require("ui/enums"); import proxy = require("ui/core/proxy"); import common = require("ui/layouts/dock-layout/dock-layout-common"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); function setNativeDockProperty(data: dependencyObservable.PropertyChangeData) { diff --git a/ui/layouts/dock-layout/dock-layout.ios.ts b/ui/layouts/dock-layout/dock-layout.ios.ts index 1965f470f..11247e143 100644 --- a/ui/layouts/dock-layout/dock-layout.ios.ts +++ b/ui/layouts/dock-layout/dock-layout.ios.ts @@ -3,6 +3,8 @@ import view = require("ui/core/view"); import enums = require("ui/enums"); import common = require("ui/layouts/dock-layout/dock-layout-common"); +global.moduleMerge(common, exports); + export class DockLayout extends common.DockLayout { protected onDockChanged(view: view.View, oldValue: number, newValue: number) { diff --git a/ui/layouts/grid-layout/grid-layout.android.ts b/ui/layouts/grid-layout/grid-layout.android.ts index b8f269ab4..ea5d7f68b 100644 --- a/ui/layouts/grid-layout/grid-layout.android.ts +++ b/ui/layouts/grid-layout/grid-layout.android.ts @@ -4,9 +4,7 @@ import view = require("ui/core/view"); import proxy = require("ui/core/proxy"); import common = require("ui/layouts/grid-layout/grid-layout-common"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) { diff --git a/ui/layouts/grid-layout/grid-layout.ios.ts b/ui/layouts/grid-layout/grid-layout.ios.ts index 6cc34df8c..957e1e737 100644 --- a/ui/layouts/grid-layout/grid-layout.ios.ts +++ b/ui/layouts/grid-layout/grid-layout.ios.ts @@ -3,9 +3,7 @@ import enums = require("ui/enums"); import view = require("ui/core/view"); import common = require("ui/layouts/grid-layout/grid-layout-common"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); export class GridLayout extends common.GridLayout { diff --git a/ui/layouts/stack-layout/stack-layout.android.ts b/ui/layouts/stack-layout/stack-layout.android.ts index 515997ad6..fc44a7dc8 100644 --- a/ui/layouts/stack-layout/stack-layout.android.ts +++ b/ui/layouts/stack-layout/stack-layout.android.ts @@ -3,9 +3,7 @@ import proxy = require("ui/core/proxy"); import common = require("ui/layouts/stack-layout/stack-layout-common"); import enums = require("ui/enums"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); export class StackLayout extends common.StackLayout { diff --git a/ui/layouts/stack-layout/stack-layout.ios.ts b/ui/layouts/stack-layout/stack-layout.ios.ts index 79c91ec8b..d033b04d6 100644 --- a/ui/layouts/stack-layout/stack-layout.ios.ts +++ b/ui/layouts/stack-layout/stack-layout.ios.ts @@ -3,9 +3,7 @@ import enums = require("ui/enums"); import view = require("ui/core/view"); import common = require("ui/layouts/stack-layout/stack-layout-common"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); export class StackLayout extends common.StackLayout { diff --git a/ui/layouts/wrap-layout/wrap-layout.android.ts b/ui/layouts/wrap-layout/wrap-layout.android.ts index 2bb51b7f9..341f901d3 100644 --- a/ui/layouts/wrap-layout/wrap-layout.android.ts +++ b/ui/layouts/wrap-layout/wrap-layout.android.ts @@ -4,9 +4,7 @@ import common = require("ui/layouts/wrap-layout/wrap-layout-common"); import enums = require("ui/enums"); import utils = require("utils/utils"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); export class WrapLayout extends common.WrapLayout { diff --git a/ui/layouts/wrap-layout/wrap-layout.ios.ts b/ui/layouts/wrap-layout/wrap-layout.ios.ts index a5019e405..da27fd24d 100644 --- a/ui/layouts/wrap-layout/wrap-layout.ios.ts +++ b/ui/layouts/wrap-layout/wrap-layout.ios.ts @@ -3,9 +3,7 @@ import view = require("ui/core/view"); import enums = require("ui/enums"); import common = require("ui/layouts/wrap-layout/wrap-layout-common"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); export class WrapLayout extends common.WrapLayout { diff --git a/ui/text-view/text-view.ios.ts b/ui/text-view/text-view.ios.ts index fbe5a59b5..5639cd00e 100644 --- a/ui/text-view/text-view.ios.ts +++ b/ui/text-view/text-view.ios.ts @@ -3,9 +3,7 @@ import dependencyObservable = require("ui/core/dependency-observable"); import textBase = require("ui/text-base"); import enums = require("ui/enums"); -// merge the exports of the common file with the exports of this file -declare var exports; -require("utils/module-merge").merge(common, exports); +global.moduleMerge(common, exports); class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate { public static ObjCProtocols = [UITextViewDelegate];