mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Fix tslint error
Change module-merge to use the global merge function
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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<Frame> = [];
|
||||
|
||||
@@ -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) {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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];
|
||||
|
||||
Reference in New Issue
Block a user