diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json index 0a0645e1a4..37aff66168 100755 --- a/aio/scripts/_payload-limits.json +++ b/aio/scripts/_payload-limits.json @@ -28,7 +28,7 @@ "uncompressed": { "runtime-es5": 2932, "runtime-es2015": 2938, - "main-es5": 560811, + "main-es5": 554933, "main-es2015": 499846, "polyfills-es5": 131024, "polyfills-es2015": 52433 diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json index 5308faa26c..e99ee1c21e 100644 --- a/integration/_payload-limits.json +++ b/integration/_payload-limits.json @@ -3,7 +3,7 @@ "master": { "uncompressed": { "runtime": 1497, - "main": 166799, + "main": 164387, "polyfills": 45399 } } @@ -21,7 +21,7 @@ "master": { "uncompressed": { "runtime": 1440, - "main": 134091, + "main": 130975, "polyfills": 45340 } } diff --git a/packages/http/test/static_request_spec.ts b/packages/http/test/static_request_spec.ts index 39f9e911fe..5217383296 100644 --- a/packages/http/test/static_request_spec.ts +++ b/packages/http/test/static_request_spec.ts @@ -6,13 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {supportsWebAnimation} from '@angular/platform-browser/testing/src/browser_util'; import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {RequestOptions} from '@angular/http/src/base_request_options'; import {ContentType} from '@angular/http/src/enums'; import {Headers} from '@angular/http/src/headers'; import {stringToArrayBuffer, stringToArrayBuffer8} from '@angular/http/src/http_utils'; import {ArrayBuffer, Request} from '@angular/http/src/static_request'; +import {supportsWebAnimation} from '@angular/platform-browser/testing/src/browser_util'; { describe('Request', () => { diff --git a/packages/language-service/src/html_info.ts b/packages/language-service/src/html_info.ts index 45f3f1bb0f..7089e26726 100644 --- a/packages/language-service/src/html_info.ts +++ b/packages/language-service/src/html_info.ts @@ -374,14 +374,6 @@ const SCHEMA: string[] = [ ':svg:cursor^:svg:|', ]; -const attrToPropMap: {[name: string]: string} = { - 'class': 'className', - 'formaction': 'formAction', - 'innerHtml': 'innerHTML', - 'readonly': 'readOnly', - 'tabindex': 'tabIndex' -}; - const EVENT = 'event'; const BOOLEAN = 'boolean'; const NUMBER = 'number'; diff --git a/packages/platform-browser/src/browser/browser_adapter.ts b/packages/platform-browser/src/browser/browser_adapter.ts index a169199065..8ddc410d5d 100644 --- a/packages/platform-browser/src/browser/browser_adapter.ts +++ b/packages/platform-browser/src/browser/browser_adapter.ts @@ -13,12 +13,6 @@ import {setRootDomAdapter} from '../dom/dom_adapter'; import {GenericBrowserDomAdapter} from './generic_browser_adapter'; -const _attrToPropMap = { - 'class': 'className', - 'innerHtml': 'innerHTML', - 'readonly': 'readOnly', - 'tabindex': 'tabIndex', -}; const DOM_KEY_LOCATION_NUMPAD = 3; @@ -117,8 +111,6 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { } } - get attrToPropMap(): any { return _attrToPropMap; } - contains(nodeA: any, nodeB: any): boolean { return nodeContains.call(nodeA, nodeB); } querySelector(el: HTMLElement, selector: string): any { return el.querySelector(selector); } querySelectorAll(el: any, selector: string): any[] { return el.querySelectorAll(selector); } @@ -147,9 +139,6 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { isPrevented(evt: Event): boolean { return evt.defaultPrevented || evt.returnValue != null && !evt.returnValue; } - getTemplateContent(el: Node): Node|null { - return 'content' in el && this.isTemplateElement(el) ? (el).content : null; - } nodeName(node: Node): string { return node.nodeName; } nodeValue(node: Node): string|null { return node.nodeValue; } type(node: HTMLInputElement): string { return node.type; } @@ -179,7 +168,6 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { } appendChild(el: Node, node: Node) { el.appendChild(node); } removeChild(el: Node, node: Node) { el.removeChild(node); } - replaceChild(el: Node, newChild: Node, oldChild: Node) { el.replaceChild(newChild, oldChild); } remove(node: Node): Node { if (node.parentNode) { node.parentNode.removeChild(node); @@ -187,17 +175,11 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { return node; } insertBefore(parent: Node, ref: Node, node: Node) { parent.insertBefore(node, ref); } - insertAllBefore(parent: Node, ref: Node, nodes: Node[]) { - nodes.forEach((n: any) => parent.insertBefore(n, ref)); - } - insertAfter(parent: Node, ref: Node, node: any) { parent.insertBefore(node, ref.nextSibling); } - setInnerHTML(el: Element, value: string) { el.innerHTML = value; } getText(el: Node): string|null { return el.textContent; } setText(el: Node, value: string) { el.textContent = value; } getValue(el: any): string { return el.value; } setValue(el: any, value: string) { el.value = value; } getChecked(el: any): boolean { return el.checked; } - setChecked(el: any, value: boolean) { el.checked = value; } createComment(text: string): Comment { return this.getDefaultDocument().createComment(text); } createTemplate(html: any): HTMLElement { const t = this.getDefaultDocument().createElement('template'); @@ -216,25 +198,10 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { doc = doc || this.getDefaultDocument(); return doc.createTextNode(text); } - createScriptTag(attrName: string, attrValue: string, doc?: Document): HTMLScriptElement { - doc = doc || this.getDefaultDocument(); - const el = doc.createElement('SCRIPT'); - el.setAttribute(attrName, attrValue); - return el; - } - createStyleElement(css: string, doc?: Document): HTMLStyleElement { - doc = doc || this.getDefaultDocument(); - const style = doc.createElement('style'); - this.appendChild(style, this.createTextNode(css, doc)); - return style; - } createShadowRoot(el: HTMLElement): DocumentFragment { return (el).createShadowRoot(); } getShadowRoot(el: HTMLElement): DocumentFragment { return (el).shadowRoot; } getHost(el: HTMLElement): HTMLElement { return (el).host; } clone(node: Node): Node { return node.cloneNode(true); } - getElementsByClassName(element: any, name: string): HTMLElement[] { - return element.getElementsByClassName(name); - } getElementsByTagName(element: any, name: string): HTMLElement[] { return element.getElementsByTagName(name); } @@ -278,13 +245,6 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { return document.implementation.createHTMLDocument('fakeTitle'); } getDefaultDocument(): Document { return document; } - getBoundingClientRect(el: Element): any { - try { - return el.getBoundingClientRect(); - } catch { - return {top: 0, bottom: 0, left: 0, right: 0, width: 0, height: 0}; - } - } getTitle(doc: Document): string { return doc.title; } setTitle(doc: Document, newTitle: string) { doc.title = newTitle || ''; } elementMatches(n: any, selector: string): boolean { @@ -305,8 +265,6 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter { return node.shadowRoot != null && node instanceof HTMLElement; } isShadowRoot(node: any): boolean { return node instanceof DocumentFragment; } - importIntoDoc(node: Node): any { return document.importNode(this.templateAwareRoot(node), true); } - adoptNode(node: Node): any { return document.adoptNode(node); } getHref(el: Element): string { return el.getAttribute('href') !; } getEventKey(event: any): string { diff --git a/packages/platform-browser/src/browser/generic_browser_adapter.ts b/packages/platform-browser/src/browser/generic_browser_adapter.ts index e71bd8e756..acd9039347 100644 --- a/packages/platform-browser/src/browser/generic_browser_adapter.ts +++ b/packages/platform-browser/src/browser/generic_browser_adapter.ts @@ -20,9 +20,6 @@ export abstract class GenericBrowserDomAdapter extends DomAdapter { constructor() { super(); } getDistributedNodes(el: HTMLElement): Node[] { return (el).getDistributedNodes(); } - resolveAndSetHref(el: HTMLAnchorElement, baseUrl: string, href: string) { - el.href = href == null ? baseUrl : baseUrl + '/../' + href; - } supportsDOMEvents(): boolean { return true; } supportsNativeShadowDOM(): boolean { return typeof(document.body).createShadowRoot === 'function'; diff --git a/packages/platform-browser/src/dom/dom_adapter.ts b/packages/platform-browser/src/dom/dom_adapter.ts index 47339d8cc8..bd592ff141 100644 --- a/packages/platform-browser/src/dom/dom_adapter.ts +++ b/packages/platform-browser/src/dom/dom_adapter.ts @@ -32,7 +32,6 @@ export function setRootDomAdapter(adapter: DomAdapter) { * can introduce XSS risks. */ export abstract class DomAdapter { - public resourceLoaderType: Type = null !; abstract hasProperty(element: any, name: string): boolean; abstract setProperty(el: Element, name: string, value: any): any; abstract getProperty(el: Element, name: string): any; @@ -43,16 +42,6 @@ export abstract class DomAdapter { abstract logGroup(error: any): any; abstract logGroupEnd(): any; - /** - * Maps attribute names to their corresponding property names for cases - * where attribute name doesn't match property name. - */ - get attrToPropMap(): {[key: string]: string} { return this._attrToPropMap; } - set attrToPropMap(value: {[key: string]: string}) { this._attrToPropMap = value; } - /** @internal */ - // TODO(issue/24571): remove '!'. - _attrToPropMap !: {[key: string]: string}; - abstract contains(nodeA: any, nodeB: any): boolean; abstract parse(templateHtml: string): any; abstract querySelector(el: any, selector: string): any; @@ -64,8 +53,6 @@ export abstract class DomAdapter { abstract createEvent(eventType: string): any; abstract preventDefault(evt: any): any; abstract isPrevented(evt: any): boolean; - /** Returns content if el is a