javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-26 11:17:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tslint error

Browse Source 
Change module-merge to use the global merge function
This commit is contained in:
hshristov
2015-08-03 13:47:45 +03:00
parent bc2f6a63c6
commit 4c03cddbd6
14 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/animation/animation.android.ts
View File

@ -5,9 +5,7 @@ import color = require("color");
import trace = require("trace"); import trace = require("trace");
import types = require("utils/types"); import types = require("utils/types");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
var floatType = java.lang.Float.class.getField("TYPE").get(null); var floatType = java.lang.Float.class.getField("TYPE").get(null);
var argbEvaluator = new android.animation.ArgbEvaluator(); var argbEvaluator = new android.animation.ArgbEvaluator();

4
ui/animation/animation.ios.ts
View File

@ -2,9 +2,7 @@
import common = require("ui/animation/animation-common"); import common = require("ui/animation/animation-common");
import trace = require("trace"); import trace = require("trace");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
var _transform = "_transform"; var _transform = "_transform";
var _skip = "_skip"; var _skip = "_skip";

1
ui/frame/frame-common.ts
View File

@ -5,7 +5,6 @@ import types = require("utils/types");
import trace = require("trace"); import trace = require("trace");
import builder = require("ui/builder"); import builder = require("ui/builder");
import fs = require("file-system"); import fs = require("file-system");
import platform = require("platform");
import fileResolverModule = require("file-system/file-name-resolver"); import fileResolverModule = require("file-system/file-name-resolver");
var frameStack: Array<Frame> = []; var frameStack: Array<Frame> = [];

4
ui/layouts/absolute-layout/absolute-layout.android.ts
View File

@ -4,9 +4,7 @@ import common = require("ui/layouts/absolute-layout/absolute-layout-common");
import dependencyObservable = require("ui/core/dependency-observable"); import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy"); import proxy = require("ui/core/proxy");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) { function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) {

4
ui/layouts/absolute-layout/absolute-layout.ios.ts
View File

@ -2,9 +2,7 @@
import view = require("ui/core/view"); import view = require("ui/core/view");
import common = require("ui/layouts/absolute-layout/absolute-layout-common"); import common = require("ui/layouts/absolute-layout/absolute-layout-common");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
export class AbsoluteLayout extends common.AbsoluteLayout { export class AbsoluteLayout extends common.AbsoluteLayout {

4
ui/layouts/dock-layout/dock-layout.android.ts
View File

@ -4,9 +4,7 @@ import enums = require("ui/enums");
import proxy = require("ui/core/proxy"); import proxy = require("ui/core/proxy");
import common = require("ui/layouts/dock-layout/dock-layout-common"); import common = require("ui/layouts/dock-layout/dock-layout-common");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
function setNativeDockProperty(data: dependencyObservable.PropertyChangeData) { function setNativeDockProperty(data: dependencyObservable.PropertyChangeData) {

2
ui/layouts/dock-layout/dock-layout.ios.ts
View File

@ -3,6 +3,8 @@ import view = require("ui/core/view");
import enums = require("ui/enums"); import enums = require("ui/enums");
import common = require("ui/layouts/dock-layout/dock-layout-common"); import common = require("ui/layouts/dock-layout/dock-layout-common");
global.moduleMerge(common, exports);
export class DockLayout extends common.DockLayout { export class DockLayout extends common.DockLayout {
protected onDockChanged(view: view.View, oldValue: number, newValue: number) { protected onDockChanged(view: view.View, oldValue: number, newValue: number) {

4
ui/layouts/grid-layout/grid-layout.android.ts
View File

@ -4,9 +4,7 @@ import view = require("ui/core/view");
import proxy = require("ui/core/proxy"); import proxy = require("ui/core/proxy");
import common = require("ui/layouts/grid-layout/grid-layout-common"); import common = require("ui/layouts/grid-layout/grid-layout-common");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) { function setNativeProperty(data: dependencyObservable.PropertyChangeData, setter: (lp: org.nativescript.widgets.CommonLayoutParams) => void) {

4
ui/layouts/grid-layout/grid-layout.ios.ts
View File

@ -3,9 +3,7 @@ import enums = require("ui/enums");
import view = require("ui/core/view"); import view = require("ui/core/view");
import common = require("ui/layouts/grid-layout/grid-layout-common"); import common = require("ui/layouts/grid-layout/grid-layout-common");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
export class GridLayout extends common.GridLayout { export class GridLayout extends common.GridLayout {

4
ui/layouts/stack-layout/stack-layout.android.ts
View File

@ -3,9 +3,7 @@ import proxy = require("ui/core/proxy");
import common = require("ui/layouts/stack-layout/stack-layout-common"); import common = require("ui/layouts/stack-layout/stack-layout-common");
import enums = require("ui/enums"); import enums = require("ui/enums");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
export class StackLayout extends common.StackLayout { export class StackLayout extends common.StackLayout {

4
ui/layouts/stack-layout/stack-layout.ios.ts
View File

@ -3,9 +3,7 @@ import enums = require("ui/enums");
import view = require("ui/core/view"); import view = require("ui/core/view");
import common = require("ui/layouts/stack-layout/stack-layout-common"); import common = require("ui/layouts/stack-layout/stack-layout-common");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
export class StackLayout extends common.StackLayout { export class StackLayout extends common.StackLayout {

4
ui/layouts/wrap-layout/wrap-layout.android.ts
View File

@ -4,9 +4,7 @@ import common = require("ui/layouts/wrap-layout/wrap-layout-common");
import enums = require("ui/enums"); import enums = require("ui/enums");
import utils = require("utils/utils"); import utils = require("utils/utils");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
export class WrapLayout extends common.WrapLayout { export class WrapLayout extends common.WrapLayout {

4
ui/layouts/wrap-layout/wrap-layout.ios.ts
View File

@ -3,9 +3,7 @@ import view = require("ui/core/view");
import enums = require("ui/enums"); import enums = require("ui/enums");
import common = require("ui/layouts/wrap-layout/wrap-layout-common"); import common = require("ui/layouts/wrap-layout/wrap-layout-common");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
export class WrapLayout extends common.WrapLayout { export class WrapLayout extends common.WrapLayout {

4
ui/text-view/text-view.ios.ts
View File

@ -3,9 +3,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
import textBase = require("ui/text-base"); import textBase = require("ui/text-base");
import enums = require("ui/enums"); import enums = require("ui/enums");
// merge the exports of the common file with the exports of this file global.moduleMerge(common, exports);
declare var exports;
require("utils/module-merge").merge(common, exports);
class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate { class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
public static ObjCProtocols = [UITextViewDelegate]; public static ObjCProtocols = [UITextViewDelegate];