cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove lang.ts (#14837)

Browse Source
This commit is contained in:
Miško Hevery
2017-03-02 09:37:01 -08:00
committed by Chuck Jazdzewski
parent 84a65cf788
commit 8343fb7740
139 changed files with 406 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/@angular/platform-server/src/facade
View File

@ -1 +0,0 @@
../../facade/src

13
modules/@angular/platform-server/src/parse5_adapter.ts
View File

@ -9,8 +9,7 @@
const parse5 = require('parse5');
import {ɵglobal as global} from '@angular/core';
import {ɵDomAdapter as DomAdapter, ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/platform-browser';
import {isPresent, isBlank, setValueOnPath} from '../src/facade/lang';
import {ɵDomAdapter as DomAdapter, ɵsetRootDomAdapter as setRootDomAdapter, ɵsetValueOnPath as setValueOnPath} from '@angular/platform-browser';
import {SelectorMatcher, CssSelector} from '@angular/compiler';
let treeAdapter: any;
@ -172,7 +171,7 @@ export class Parse5DomAdapter extends DomAdapter {
return event;
}
preventDefault(event: any) { event.returnValue = false; }
isPrevented(event: any): boolean { return isPresent(event.returnValue) && !event.returnValue; }
isPrevented(event: any): boolean { return event.returnValue != null && !event.returnValue; }
getInnerHTML(el: any): string {
return parse5.serialize(this.templateAwareRoot(el), {treeAdapter});
}
@ -340,7 +339,7 @@ export class Parse5DomAdapter extends DomAdapter {
nodeClone.children = null;
mapProps.forEach(mapName => {
if (isPresent(node[mapName])) {
if (node[mapName] != null) {
nodeClone[mapName] = {};
for (const prop in node[mapName]) {
nodeClone[mapName][prop] = node[mapName][prop];
@ -500,7 +499,7 @@ export class Parse5DomAdapter extends DomAdapter {
isTextNode(node: any): boolean { return treeAdapter.isTextNode(node); }
isCommentNode(node: any): boolean { return treeAdapter.isCommentNode(node); }
isElementNode(node: any): boolean { return node ? treeAdapter.isElementNode(node) : false; }
hasShadowRoot(node: any): boolean { return isPresent(node.shadowRoot); }
hasShadowRoot(node: any): boolean { return node.shadowRoot != null; }
isShadowRoot(node: any): boolean { return this.getShadowRoot(node) == node; }
importIntoDoc(node: any): any { return this.clone(node); }
adoptNode(node: any): any { return node; }
@ -529,7 +528,7 @@ export class Parse5DomAdapter extends DomAdapter {
.replace(/\s*\+\s*/g, ' + ')
.replace(/\s*>\s*/g, ' > ')
.replace(/\[(\w+)=(\w+)\]/g, '[$1="$2"]'));
if (isBlank(parsedRule.declarations)) {
if (parsedRule.declarations == null) {
continue;
}
for (let j = 0; j < parsedRule.declarations.length; j++) {
@ -566,7 +565,7 @@ export class Parse5DomAdapter extends DomAdapter {
href = this.getHref(base);
}
// TODO(alxhub): Need relative path logic from BrowserDomAdapter here?
return isBlank(href) ? null : href;
return href == null ? null : href;
}
resetBaseElement(): void { throw 'not implemented'; }
getHistory(): History { throw 'not implemented'; }

6
modules/@angular/platform-server/src/server_renderer.ts
View File

@ -7,11 +7,9 @@
*/
import {DomElementSchemaRegistry} from '@angular/compiler';
import {APP_ID, Inject, Injectable, NgZone, RenderComponentType, Renderer, RendererFactoryV2, RendererTypeV2, RendererV2, RootRenderer, ViewEncapsulation} from '@angular/core';
import {APP_ID, Inject, Injectable, NgZone, RenderComponentType, Renderer, RendererFactoryV2, RendererTypeV2, RendererV2, RootRenderer, ViewEncapsulation, ɵstringify as stringify} from '@angular/core';
import {DOCUMENT, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵgetDOM as getDOM, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute} from '@angular/platform-browser';
import {isBlank, isPresent, stringify} from './facade/lang';
const EMPTY_ARRAY: any[] = [];
@Injectable()
@ -151,7 +149,7 @@ class DefaultServerRendererV2 implements RendererV2 {
getDOM().setProperty(el, name, value);
// Mirror property values for known HTML element properties in the attributes.
const tagName = (el.tagName as string).toLowerCase();
if (isPresent(value) && (typeof value === 'number' || typeof value == 'string') &&
if (value != null && (typeof value === 'number' || typeof value == 'string') &&
this.schema.hasElement(tagName, EMPTY_ARRAY) &&
this.schema.hasProperty(tagName, name, EMPTY_ARRAY) &&
this._isSafeToReflectProperty(tagName, name)) {

1
modules/@angular/platform-server/testing/facade
View File

@ -1 +0,0 @@
../../facade/src