Skip to content

Commit 21bf64e

Browse files
author
vakrilov
committed
chore(cleanup): Limit the use of lang-facade
1 parent 9f87e5c commit 21bf64e

File tree

4 files changed

+6
-69
lines changed

4 files changed

+6
-69
lines changed

nativescript-angular/dom-adapter.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import { Type } from "@angular/core";
33
import { ɵDomAdapter } from "@angular/platform-browser";
44
import { rendererLog } from "./trace";
5-
import { print } from "./lang-facade";
65

76
export class NativeScriptDomAdapter implements ɵDomAdapter {
87
static makeCurrent() {
@@ -27,15 +26,15 @@ export class NativeScriptDomAdapter implements ɵDomAdapter {
2726
}
2827

2928
log(arg: any): void {
30-
print(arg);
29+
console.log(arg);
3130
}
3231

3332
logError(arg: any): void {
34-
print(arg);
33+
console.log(arg);
3534
}
3635

3736
logGroup(arg: any): void {
38-
print(arg);
37+
console.log(arg);
3938
}
4039

4140
logGroupEnd(): void {

nativescript-angular/lang-facade.ts

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,7 @@
1-
/* tslint:disable */
2-
//Copied unexported functions from @angular/core/src/facade/lang
3-
var globalScope = global;
4-
export var global = globalScope;
5-
61
export function isPresent(obj: any): boolean {
72
return obj !== undefined && obj !== null;
83
}
94

105
export function isBlank(obj: any): boolean {
116
return obj === undefined || obj === null;
127
}
13-
14-
export function isDate(obj: any): obj is Date {
15-
return obj instanceof Date && !isNaN(obj.valueOf());
16-
}
17-
18-
export function print(obj: Error | Object) {
19-
console.log(obj);
20-
}
21-
22-
export function isJsObject(o: any): boolean {
23-
return o !== null && (typeof o === 'function' || typeof o === 'object');
24-
}
25-
26-
export function isArray(obj: any): boolean {
27-
return Array.isArray(obj);
28-
}
29-
30-
// When Symbol.iterator doesn't exist, retrieves the key used in es6-shim
31-
declare var Symbol: any;
32-
let _symbolIterator: any = null;
33-
export function getSymbolIterator(): string|symbol {
34-
if (isBlank(_symbolIterator)) {
35-
if (isPresent((<any>globalScope).Symbol) && isPresent(Symbol.iterator)) {
36-
_symbolIterator = Symbol.iterator;
37-
} else {
38-
// es6-shim specific logic
39-
let keys = Object.getOwnPropertyNames(Map.prototype);
40-
for (let i = 0; i < keys.length; ++i) {
41-
let key = keys[i];
42-
if (key !== 'entries' && key !== 'size' &&
43-
(Map as any).prototype[key] === Map.prototype['entries']) {
44-
_symbolIterator = key;
45-
}
46-
}
47-
}
48-
}
49-
return _symbolIterator;
50-
}
51-
52-
export function setValueOnPath(global: any, path: string, value: any) {
53-
let parts = path.split('.');
54-
let obj: any = global;
55-
while (parts.length > 1) {
56-
let name = parts.shift();
57-
if (obj.hasOwnProperty(name) && isPresent(obj[name])) {
58-
obj = obj[name];
59-
} else {
60-
obj = obj[name] = {};
61-
}
62-
}
63-
if (obj === undefined || obj === null) {
64-
obj = {};
65-
}
66-
obj[parts.shift()] = value;
67-
}

nativescript-angular/renderer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { topmost } from "tns-core-modules/ui/frame";
1111
import { profile } from "tns-core-modules/profiling";
1212

1313
import { APP_ROOT_VIEW, DEVICE, getRootPage } from "./platform-providers";
14-
import { isBlank } from "./lang-facade";
1514
import { ViewUtil } from "./view-util";
1615
import { NgView, InvisibleNode } from "./element-registry";
1716
import { rendererLog as traceLog } from "./trace";
@@ -60,7 +59,7 @@ export class NativeScriptRendererFactory implements RendererFactory2 {
6059
}
6160

6261
let renderer: NativeScriptRenderer = this.componentRenderers.get(type.id);
63-
if (!isBlank(renderer)) {
62+
if (renderer) {
6463
return renderer;
6564
}
6665

nativescript-angular/router/page-router-outlet.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { profile } from "tns-core-modules/profiling";
1919

2020
import { BehaviorSubject } from "rxjs/BehaviorSubject";
2121

22-
import { isPresent } from "../lang-facade";
2322
import { DEVICE, PAGE_FACTORY, PageFactory } from "../platform-providers";
2423
import { routerLog as log } from "../trace";
2524
import { DetachedLoader } from "../common/detached-loader";
@@ -40,9 +39,9 @@ export const pageRouterActivatedSymbol = Symbol("page-router-activated");
4039
export const loaderRefSymbol = Symbol("loader-ref");
4140

4241
export function destroyComponentRef(componentRef: ComponentRef<any>) {
43-
if (isPresent(componentRef)) {
42+
if (componentRef) {
4443
const loaderRef = componentRef[loaderRefSymbol];
45-
if (isPresent(loaderRef)) {
44+
if (loaderRef) {
4645
loaderRef.destroy();
4746
}
4847
componentRef.destroy();

0 commit comments

Comments
 (0)