Skip to content

Commit ff89b5f

Browse files
committed
chore(modules): Use fully-qualified imports for tns-core-modules
1 parent b96b61f commit ff89b5f

29 files changed

+94
-101
lines changed

nativescript-angular/animation-driver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AnimationPlayer } from "@angular/core";
22
import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
33
import { NativeScriptAnimationPlayer } from "./animation-player";
4-
import { View } from "ui/core/view";
4+
import { View } from "tns-core-modules/ui/core/view";
55

66
export abstract class AnimationDriver {
77
abstract animate(

nativescript-angular/animation-player.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {
55
KeyframeAnimationInfo,
66
KeyframeInfo,
77
KeyframeDeclaration
8-
} from "ui/animation/keyframe-animation";
9-
import { View } from "ui/core/view";
10-
import { AnimationCurve } from "ui/enums";
11-
import { isString } from "utils/types";
12-
import { CssAnimationProperty } from "ui/core/properties";
8+
} from "tns-core-modules/ui/animation/keyframe-animation";
9+
import { View } from "tns-core-modules/ui/core/view";
10+
import { AnimationCurve } from "tns-core-modules/ui/enums";
11+
import { isString } from "tns-core-modules/utils/types";
12+
import { CssAnimationProperty } from "tns-core-modules/ui/core/properties";
1313

1414
export class NativeScriptAnimationPlayer implements AnimationPlayer {
1515

nativescript-angular/common/detached-loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
ComponentRef, ComponentFactory, ViewContainerRef,
33
Component, Type, ComponentFactoryResolver, ChangeDetectorRef
44
} from "@angular/core";
5-
import { write } from "trace";
5+
import { write } from "tns-core-modules/trace";
66

77
export const CATEGORY = "detached-loader";
88
function log(message: string) {

nativescript-angular/directives/action-bar.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Directive, Component, ElementRef, Optional, OnDestroy } from "@angular/core";
2-
import { ActionItem, ActionBar, NavigationButton } from "ui/action-bar";
2+
import { ActionItem, ActionBar, NavigationButton } from "tns-core-modules/ui/action-bar";
33
import { isBlank } from "../lang-facade";
4-
import { Page } from "ui/page";
5-
import { View } from "ui/core/view";
4+
import { Page } from "tns-core-modules/ui/page";
5+
import { View } from "tns-core-modules/ui/core/view";
66
import { registerElement, ViewClassMeta, NgView, TEMPLATE } from "../element-registry";
77

88
let actionBarMeta: ViewClassMeta = {

nativescript-angular/directives/dialogs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import {
22
ReflectiveInjector, ComponentFactoryResolver, ViewContainerRef,
33
Type, Injectable, ComponentRef, Directive
44
} from "@angular/core";
5-
import { Page } from "ui/page";
6-
import { View } from "ui/core/view";
5+
import { Page } from "tns-core-modules/ui/page";
6+
import { View } from "tns-core-modules/ui/core/view";
77
import { DetachedLoader } from "../common/detached-loader";
88
import { PageFactory, PAGE_FACTORY } from "../platform-providers";
99

nativescript-angular/directives/list-view-comp.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import {
2121
} from "@angular/core";
2222
import { isBlank } from "../lang-facade";
2323
import { isListLikeIterable } from "../collection-facade";
24-
import { ListView } from "ui/list-view";
25-
import { View, KeyedTemplate } from "ui/core/view";
26-
import { ObservableArray } from "data/observable-array";
27-
import { LayoutBase } from "ui/layouts/layout-base";
24+
import { ListView } from "tns-core-modules/ui/list-view";
25+
import { View, KeyedTemplate } from "tns-core-modules/ui/core/view";
26+
import { ObservableArray } from "tns-core-modules/data/observable-array";
27+
import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
2828
import { listViewLog } from "../trace";
2929

3030
const NG_VIEW = "_ngViewRef";

nativescript-angular/directives/platform-filters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Inject } from "@angular/core";
2-
import { Device, platformNames } from "platform";
2+
import { Device, platformNames } from "tns-core-modules/platform";
33
import { DEVICE } from "../platform-providers";
44

55
@Component({

nativescript-angular/directives/tab-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ElementRef, Directive, Input, TemplateRef, ViewContainerRef, OnInit, AfterViewInit } from "@angular/core";
2-
import { TabView, TabViewItem } from "ui/tab-view";
2+
import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
33
import { convertToInt } from "../common/utils";
44
import { rendererLog } from "../trace";
55
import { isBlank } from "../lang-facade";

nativescript-angular/element-registry.ts

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { View } from "ui/core/view";
1+
import { View } from "tns-core-modules/ui/core/view";
22

33
export type ViewResolver = () => ViewClass;
44
export type NgView = View & ViewExtensions;
@@ -78,42 +78,42 @@ registerElement(TEMPLATE, () => TemplateView, { isTemplateAnchor: true });
7878

7979
// Register default NativeScript components
8080
// Note: ActionBar related components are registerd together with action-bar directives.
81-
registerElement("AbsoluteLayout", () => require("ui/layouts/absolute-layout").AbsoluteLayout);
82-
registerElement("ActivityIndicator", () => require("ui/activity-indicator").ActivityIndicator);
83-
registerElement("Border", () => require("ui/border").Border);
84-
registerElement("Button", () => require("ui/button").Button);
85-
registerElement("ContentView", () => require("ui/content-view").ContentView);
86-
registerElement("DatePicker", () => require("ui/date-picker").DatePicker);
87-
registerElement("DockLayout", () => require("ui/layouts/dock-layout").DockLayout);
88-
registerElement("GridLayout", () => require("ui/layouts/grid-layout").GridLayout);
89-
registerElement("HtmlView", () => require("ui/html-view").HtmlView);
90-
registerElement("Image", () => require("ui/image").Image);
81+
registerElement("AbsoluteLayout", () => require("tns-core-modules/ui/layouts/absolute-layout").AbsoluteLayout);
82+
registerElement("ActivityIndicator", () => require("tns-core-modules/ui/activity-indicator").ActivityIndicator);
83+
registerElement("Border", () => require("tns-core-modules/ui/border").Border);
84+
registerElement("Button", () => require("tns-core-modules/ui/button").Button);
85+
registerElement("ContentView", () => require("tns-core-modules/ui/content-view").ContentView);
86+
registerElement("DatePicker", () => require("tns-core-modules/ui/date-picker").DatePicker);
87+
registerElement("DockLayout", () => require("tns-core-modules/ui/layouts/dock-layout").DockLayout);
88+
registerElement("GridLayout", () => require("tns-core-modules/ui/layouts/grid-layout").GridLayout);
89+
registerElement("HtmlView", () => require("tns-core-modules/ui/html-view").HtmlView);
90+
registerElement("Image", () => require("tns-core-modules/ui/image").Image);
9191
// Parse5 changes <Image> tags to <img>. WTF!
92-
registerElement("img", () => require("ui/image").Image);
93-
registerElement("Label", () => require("ui/label").Label);
94-
registerElement("ListPicker", () => require("ui/list-picker").ListPicker);
95-
registerElement("ListView", () => require("ui/list-view").ListView);
96-
registerElement("Page", () => require("ui/page").Page);
97-
registerElement("Placeholder", () => require("ui/placeholder").Placeholder);
98-
registerElement("Progress", () => require("ui/progress").Progress);
99-
registerElement("ProxyViewContainer", () => require("ui/proxy-view-container").ProxyViewContainer);
100-
registerElement("Repeater", () => require("ui/repeater").Repeater);
101-
registerElement("ScrollView", () => require("ui/scroll-view").ScrollView);
102-
registerElement("SearchBar", () => require("ui/search-bar").SearchBar);
103-
registerElement("SegmentedBar", () => require("ui/segmented-bar").SegmentedBar);
104-
registerElement("SegmentedBarItem", () => require("ui/segmented-bar").SegmentedBarItem);
105-
registerElement("Slider", () => require("ui/slider").Slider);
106-
registerElement("StackLayout", () => require("ui/layouts/stack-layout").StackLayout);
107-
registerElement("FlexboxLayout", () => require("ui/layouts/flexbox-layout").FlexboxLayout);
108-
registerElement("Switch", () => require("ui/switch").Switch);
109-
registerElement("TabView", () => require("ui/tab-view").TabView);
110-
registerElement("TextField", () => require("ui/text-field").TextField);
111-
registerElement("TextView", () => require("ui/text-view").TextView);
112-
registerElement("TimePicker", () => require("ui/time-picker").TimePicker);
113-
registerElement("WebView", () => require("ui/web-view").WebView);
114-
registerElement("WrapLayout", () => require("ui/layouts/wrap-layout").WrapLayout);
115-
registerElement("FormattedString", () => require("text/formatted-string").FormattedString);
116-
registerElement("Span", () => require("text/span").Span);
92+
registerElement("img", () => require("tns-core-modules/ui/image").Image);
93+
registerElement("Label", () => require("tns-core-modules/ui/label").Label);
94+
registerElement("ListPicker", () => require("tns-core-modules/ui/list-picker").ListPicker);
95+
registerElement("ListView", () => require("tns-core-modules/ui/list-view").ListView);
96+
registerElement("Page", () => require("tns-core-modules/ui/page").Page);
97+
registerElement("Placeholder", () => require("tns-core-modules/ui/placeholder").Placeholder);
98+
registerElement("Progress", () => require("tns-core-modules/ui/progress").Progress);
99+
registerElement("ProxyViewContainer", () => require("tns-core-modules/ui/proxy-view-container").ProxyViewContainer);
100+
registerElement("Repeater", () => require("tns-core-modules/ui/repeater").Repeater);
101+
registerElement("ScrollView", () => require("tns-core-modules/ui/scroll-view").ScrollView);
102+
registerElement("SearchBar", () => require("tns-core-modules/ui/search-bar").SearchBar);
103+
registerElement("SegmentedBar", () => require("tns-core-modules/ui/segmented-bar").SegmentedBar);
104+
registerElement("SegmentedBarItem", () => require("tns-core-modules/ui/segmented-bar").SegmentedBarItem);
105+
registerElement("Slider", () => require("tns-core-modules/ui/slider").Slider);
106+
registerElement("StackLayout", () => require("tns-core-modules/ui/layouts/stack-layout").StackLayout);
107+
registerElement("FlexboxLayout", () => require("tns-core-modules/ui/layouts/flexbox-layout").FlexboxLayout);
108+
registerElement("Switch", () => require("tns-core-modules/ui/switch").Switch);
109+
registerElement("TabView", () => require("tns-core-modules/ui/tab-view").TabView);
110+
registerElement("TextField", () => require("tns-core-modules/ui/text-field").TextField);
111+
registerElement("TextView", () => require("tns-core-modules/ui/text-view").TextView);
112+
registerElement("TimePicker", () => require("tns-core-modules/ui/time-picker").TimePicker);
113+
registerElement("WebView", () => require("tns-core-modules/ui/web-view").WebView);
114+
registerElement("WrapLayout", () => require("tns-core-modules/ui/layouts/wrap-layout").WrapLayout);
115+
registerElement("FormattedString", () => require("tns-core-modules/text/formatted-string").FormattedString);
116+
registerElement("Span", () => require("tns-core-modules/text/span").Span);
117117

118-
registerElement("DetachedContainer", () => require("ui/proxy-view-container").ProxyViewContainer,
118+
registerElement("DetachedContainer", () => require("tns-core-modules/ui/proxy-view-container").ProxyViewContainer,
119119
{ skipAddToDom: true });

nativescript-angular/file-system/ns-file-system.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable } from "@angular/core";
2-
import { knownFolders, Folder } from "file-system";
2+
import { knownFolders, Folder } from "tns-core-modules/file-system";
33

44
// Allows greater flexibility with `file-system` and Angular
55
// Also provides a way for `file-system` to be mocked for testing

0 commit comments

Comments
 (0)