style(lint): re-format modules/@angular
This commit is contained in:
@ -1,7 +1,9 @@
|
||||
import {DebugElement} from '@angular/core';
|
||||
import {Type, isPresent} from '../../facade/lang';
|
||||
import {Predicate} from '../../facade/collection';
|
||||
|
||||
import {getDOM} from '../../dom/dom_adapter';
|
||||
import {Predicate} from '../../facade/collection';
|
||||
import {Type, isPresent} from '../../facade/lang';
|
||||
|
||||
|
||||
|
||||
/**
|
||||
@ -27,8 +29,8 @@ export class By {
|
||||
static css(selector: string): Predicate<DebugElement> {
|
||||
return (debugElement) => {
|
||||
return isPresent(debugElement.nativeElement) ?
|
||||
getDOM().elementMatches(debugElement.nativeElement, selector) :
|
||||
false;
|
||||
getDOM().elementMatches(debugElement.nativeElement, selector) :
|
||||
false;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -1,17 +1,15 @@
|
||||
import {
|
||||
DebugNode,
|
||||
getDebugNode,
|
||||
RootRenderer,
|
||||
NgZone,
|
||||
ApplicationRef
|
||||
} from '@angular/core';
|
||||
import {ApplicationRef, DebugNode, NgZone, RootRenderer, getDebugNode} from '@angular/core';
|
||||
|
||||
import {DebugDomRootRenderer} from '../../../core_private';
|
||||
import {assertionsEnabled} from '../../facade/lang';
|
||||
import {getDOM} from '../dom_adapter';
|
||||
import {DomRootRenderer} from '../dom_renderer';
|
||||
|
||||
|
||||
const CORE_TOKENS = {'ApplicationRef': ApplicationRef, 'NgZone': NgZone};
|
||||
const CORE_TOKENS = {
|
||||
'ApplicationRef': ApplicationRef,
|
||||
'NgZone': NgZone
|
||||
};
|
||||
|
||||
const INSPECT_GLOBAL_NAME = 'ng.probe';
|
||||
const CORE_TOKENS_GLOBAL_NAME = 'ng.coreTokens';
|
||||
@ -41,18 +39,8 @@ function _createRootRenderer(rootRenderer: any /** TODO #9100 */) {
|
||||
/**
|
||||
* Providers which support debugging Angular applications (e.g. via `ng.probe`).
|
||||
*/
|
||||
export const ELEMENT_PROBE_PROVIDERS: any[] = [
|
||||
{
|
||||
provide: RootRenderer,
|
||||
useFactory: _createConditionalRootRenderer,
|
||||
deps: [DomRootRenderer]
|
||||
}
|
||||
];
|
||||
export const ELEMENT_PROBE_PROVIDERS: any[] =
|
||||
[{provide: RootRenderer, useFactory: _createConditionalRootRenderer, deps: [DomRootRenderer]}];
|
||||
|
||||
export const ELEMENT_PROBE_PROVIDERS_PROD_MODE: any[] = [
|
||||
{
|
||||
provide: RootRenderer,
|
||||
useFactory: _createRootRenderer,
|
||||
deps: [DomRootRenderer]
|
||||
}
|
||||
];
|
||||
export const ELEMENT_PROBE_PROVIDERS_PROD_MODE: any[] =
|
||||
[{provide: RootRenderer, useFactory: _createRootRenderer, deps: [DomRootRenderer]}];
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {isBlank, Type} from '../facade/lang';
|
||||
import {Type, isBlank} from '../facade/lang';
|
||||
|
||||
var _DOM: DomAdapter = null;
|
||||
|
||||
@ -48,9 +48,14 @@ export abstract class DomAdapter {
|
||||
abstract query(selector: string): any;
|
||||
abstract querySelector(el: any /** TODO #9100 */, selector: string): HTMLElement;
|
||||
abstract querySelectorAll(el: any /** TODO #9100 */, selector: string): any[];
|
||||
abstract on(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract onAndCancel(el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */): Function;
|
||||
abstract dispatchEvent(el: any /** TODO #9100 */, evt: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract on(
|
||||
el: any /** TODO #9100 */, evt: any /** TODO #9100 */, listener: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract onAndCancel(
|
||||
el: any /** TODO #9100 */, evt: any /** TODO #9100 */,
|
||||
listener: any /** TODO #9100 */): Function;
|
||||
abstract dispatchEvent(el: any /** TODO #9100 */, evt: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract createMouseEvent(eventType: any /** TODO #9100 */): any;
|
||||
abstract createEvent(eventType: string): any;
|
||||
abstract preventDefault(evt: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
@ -69,14 +74,22 @@ export abstract class DomAdapter {
|
||||
abstract childNodes(el: any /** TODO #9100 */): Node[];
|
||||
abstract childNodesAsList(el: any /** TODO #9100 */): Node[];
|
||||
abstract clearNodes(el: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract appendChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract removeChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract replaceChild(el: any /** TODO #9100 */, newNode: any /** TODO #9100 */, oldNode: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract appendChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract removeChild(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract replaceChild(
|
||||
el: any /** TODO #9100 */, newNode: any /** TODO #9100 */,
|
||||
oldNode: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract remove(el: any /** TODO #9100 */): Node;
|
||||
abstract insertBefore(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract insertAllBefore(el: any /** TODO #9100 */, nodes: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract insertAfter(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract setInnerHTML(el: any /** TODO #9100 */, value: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract insertBefore(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract insertAllBefore(el: any /** TODO #9100 */, nodes: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract insertAfter(el: any /** TODO #9100 */, node: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract setInnerHTML(el: any /** TODO #9100 */, value: any /** TODO #9100 */): any
|
||||
/** TODO #9100 */;
|
||||
abstract getText(el: any /** TODO #9100 */): string;
|
||||
abstract setText(el: any /** TODO #9100 */, value: string): any /** TODO #9100 */;
|
||||
abstract getValue(el: any /** TODO #9100 */): string;
|
||||
@ -88,7 +101,8 @@ export abstract class DomAdapter {
|
||||
abstract createElement(tagName: any /** TODO #9100 */, doc?: any /** TODO #9100 */): HTMLElement;
|
||||
abstract createElementNS(ns: string, tagName: string, doc?: any /** TODO #9100 */): Element;
|
||||
abstract createTextNode(text: string, doc?: any /** TODO #9100 */): Text;
|
||||
abstract createScriptTag(attrName: string, attrValue: string, doc?: any /** TODO #9100 */): HTMLElement;
|
||||
abstract createScriptTag(attrName: string, attrValue: string, doc?: any /** TODO #9100 */):
|
||||
HTMLElement;
|
||||
abstract createStyleElement(css: string, doc?: any /** TODO #9100 */): HTMLStyleElement;
|
||||
abstract createShadowRoot(el: any /** TODO #9100 */): any;
|
||||
abstract getShadowRoot(el: any /** TODO #9100 */): any;
|
||||
@ -101,20 +115,26 @@ export abstract class DomAdapter {
|
||||
abstract addClass(element: any /** TODO #9100 */, className: string): any /** TODO #9100 */;
|
||||
abstract removeClass(element: any /** TODO #9100 */, className: string): any /** TODO #9100 */;
|
||||
abstract hasClass(element: any /** TODO #9100 */, className: string): boolean;
|
||||
abstract setStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string): any /** TODO #9100 */;
|
||||
abstract setStyle(element: any /** TODO #9100 */, styleName: string, styleValue: string): any
|
||||
/** TODO #9100 */;
|
||||
abstract removeStyle(element: any /** TODO #9100 */, styleName: string): any /** TODO #9100 */;
|
||||
abstract getStyle(element: any /** TODO #9100 */, styleName: string): string;
|
||||
abstract hasStyle(element: any /** TODO #9100 */, styleName: string, styleValue?: string): boolean;
|
||||
abstract hasStyle(element: any /** TODO #9100 */, styleName: string, styleValue?: string):
|
||||
boolean;
|
||||
abstract tagName(element: any /** TODO #9100 */): string;
|
||||
abstract attributeMap(element: any /** TODO #9100 */): Map<string, string>;
|
||||
abstract hasAttribute(element: any /** TODO #9100 */, attribute: string): boolean;
|
||||
abstract hasAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): boolean;
|
||||
abstract getAttribute(element: any /** TODO #9100 */, attribute: string): string;
|
||||
abstract getAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): string;
|
||||
abstract setAttribute(element: any /** TODO #9100 */, name: string, value: string): any /** TODO #9100 */;
|
||||
abstract setAttributeNS(element: any /** TODO #9100 */, ns: string, name: string, value: string): any /** TODO #9100 */;
|
||||
abstract removeAttribute(element: any /** TODO #9100 */, attribute: string): any /** TODO #9100 */;
|
||||
abstract removeAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): any /** TODO #9100 */;
|
||||
abstract setAttribute(element: any /** TODO #9100 */, name: string, value: string): any
|
||||
/** TODO #9100 */;
|
||||
abstract setAttributeNS(element: any /** TODO #9100 */, ns: string, name: string, value: string):
|
||||
any /** TODO #9100 */;
|
||||
abstract removeAttribute(element: any /** TODO #9100 */, attribute: string): any
|
||||
/** TODO #9100 */;
|
||||
abstract removeAttributeNS(element: any /** TODO #9100 */, ns: string, attribute: string): any
|
||||
/** TODO #9100 */;
|
||||
abstract templateAwareRoot(el: any /** TODO #9100 */): any /** TODO #9100 */;
|
||||
abstract createHtmlDocument(): HTMLDocument;
|
||||
abstract defaultDoc(): HTMLDocument;
|
||||
@ -132,7 +152,8 @@ export abstract class DomAdapter {
|
||||
abstract adoptNode /*<T extends Node>*/ (node: Node /*T*/): Node /*T*/;
|
||||
abstract getHref(element: any /** TODO #9100 */): string;
|
||||
abstract getEventKey(event: any /** TODO #9100 */): string;
|
||||
abstract resolveAndSetHref(element: any /** TODO #9100 */, baseUrl: string, href: string): any /** TODO #9100 */;
|
||||
abstract resolveAndSetHref(element: any /** TODO #9100 */, baseUrl: string, href: string): any
|
||||
/** TODO #9100 */;
|
||||
abstract supportsDOMEvents(): boolean;
|
||||
abstract supportsNativeShadowDOM(): boolean;
|
||||
abstract getGlobalEventTarget(target: string): any;
|
||||
@ -141,7 +162,8 @@ export abstract class DomAdapter {
|
||||
abstract getBaseHref(): string;
|
||||
abstract resetBaseElement(): void;
|
||||
abstract getUserAgent(): string;
|
||||
abstract setData(element: any /** TODO #9100 */, name: string, value: string): any /** TODO #9100 */;
|
||||
abstract setData(element: any /** TODO #9100 */, name: string, value: string): any
|
||||
/** TODO #9100 */;
|
||||
abstract getComputedStyle(element: any /** TODO #9100 */): any;
|
||||
abstract getData(element: any /** TODO #9100 */, name: string): string;
|
||||
abstract setGlobalVar(name: string, value: any): any /** TODO #9100 */;
|
||||
|
@ -1,52 +1,31 @@
|
||||
import {
|
||||
Inject,
|
||||
Injectable,
|
||||
OpaqueToken,
|
||||
Renderer,
|
||||
RootRenderer,
|
||||
RenderComponentType,
|
||||
ViewEncapsulation
|
||||
} from '@angular/core';
|
||||
import {
|
||||
isPresent,
|
||||
isBlank,
|
||||
Json,
|
||||
RegExpWrapper,
|
||||
stringify,
|
||||
StringWrapper,
|
||||
isArray,
|
||||
isString
|
||||
} from '../facade/lang';
|
||||
import {Inject, Injectable, OpaqueToken, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
|
||||
|
||||
import {StringMapWrapper} from '../facade/collection';
|
||||
|
||||
import {BaseException} from '../facade/exceptions';
|
||||
import {Json, RegExpWrapper, StringWrapper, isArray, isBlank, isPresent, isString, stringify} from '../facade/lang';
|
||||
|
||||
import {DomSharedStylesHost} from './shared_styles_host';
|
||||
|
||||
import {
|
||||
AnimationKeyframe,
|
||||
AnimationStyles,
|
||||
AnimationPlayer,
|
||||
AnimationDriver,
|
||||
RenderDebugInfo,
|
||||
} from '../../core_private';
|
||||
import {AnimationKeyframe, AnimationStyles, AnimationPlayer, AnimationDriver, RenderDebugInfo,} from '../../core_private';
|
||||
|
||||
import {EventManager} from './events/event_manager';
|
||||
import {DOCUMENT} from './dom_tokens';
|
||||
import {getDOM} from './dom_adapter';
|
||||
import {camelCaseToDashCase} from './util';
|
||||
|
||||
const NAMESPACE_URIS =
|
||||
{'xlink': 'http://www.w3.org/1999/xlink', 'svg': 'http://www.w3.org/2000/svg'};
|
||||
const NAMESPACE_URIS = {
|
||||
'xlink': 'http://www.w3.org/1999/xlink',
|
||||
'svg': 'http://www.w3.org/2000/svg'
|
||||
};
|
||||
const TEMPLATE_COMMENT_TEXT = 'template bindings={}';
|
||||
var TEMPLATE_BINDINGS_EXP = /^template bindings=(.*)$/g;
|
||||
|
||||
export abstract class DomRootRenderer implements RootRenderer {
|
||||
protected registeredComponents: Map<string, DomRenderer> = new Map<string, DomRenderer>();
|
||||
|
||||
constructor(public document: any, public eventManager: EventManager,
|
||||
public sharedStylesHost: DomSharedStylesHost,
|
||||
public animationDriver: AnimationDriver) {}
|
||||
constructor(
|
||||
public document: any, public eventManager: EventManager,
|
||||
public sharedStylesHost: DomSharedStylesHost, public animationDriver: AnimationDriver) {}
|
||||
|
||||
renderComponent(componentProto: RenderComponentType): Renderer {
|
||||
var renderer = this.registeredComponents.get(componentProto.id);
|
||||
@ -60,9 +39,9 @@ export abstract class DomRootRenderer implements RootRenderer {
|
||||
|
||||
@Injectable()
|
||||
export class DomRootRenderer_ extends DomRootRenderer {
|
||||
constructor(@Inject(DOCUMENT) _document: any, _eventManager: EventManager,
|
||||
sharedStylesHost: DomSharedStylesHost,
|
||||
animationDriver: AnimationDriver) {
|
||||
constructor(
|
||||
@Inject(DOCUMENT) _document: any, _eventManager: EventManager,
|
||||
sharedStylesHost: DomSharedStylesHost, animationDriver: AnimationDriver) {
|
||||
super(_document, _eventManager, sharedStylesHost, animationDriver);
|
||||
}
|
||||
}
|
||||
@ -72,8 +51,9 @@ export class DomRenderer implements Renderer {
|
||||
private _hostAttr: string;
|
||||
private _styles: string[];
|
||||
|
||||
constructor(private _rootRenderer: DomRootRenderer, private componentProto: RenderComponentType,
|
||||
private _animationDriver: AnimationDriver) {
|
||||
constructor(
|
||||
private _rootRenderer: DomRootRenderer, private componentProto: RenderComponentType,
|
||||
private _animationDriver: AnimationDriver) {
|
||||
this._styles = _flattenStyles(componentProto.id, componentProto.styles, []);
|
||||
if (componentProto.encapsulation !== ViewEncapsulation.Native) {
|
||||
this._rootRenderer.sharedStylesHost.addStyles(this._styles);
|
||||
@ -87,7 +67,7 @@ export class DomRenderer implements Renderer {
|
||||
}
|
||||
}
|
||||
|
||||
selectRootElement(selectorOrNode: string | any, debugInfo: RenderDebugInfo): Element {
|
||||
selectRootElement(selectorOrNode: string|any, debugInfo: RenderDebugInfo): Element {
|
||||
var el: any /** TODO #9100 */;
|
||||
if (isString(selectorOrNode)) {
|
||||
el = getDOM().querySelector(this._rootRenderer.document, selectorOrNode);
|
||||
@ -104,8 +84,9 @@ export class DomRenderer implements Renderer {
|
||||
createElement(parent: Element, name: string, debugInfo: RenderDebugInfo): Node {
|
||||
var nsAndName = splitNamespace(name);
|
||||
var el = isPresent(nsAndName[0]) ?
|
||||
getDOM().createElementNS((NAMESPACE_URIS as any /** TODO #9100 */)[nsAndName[0]], nsAndName[1]) :
|
||||
getDOM().createElement(nsAndName[1]);
|
||||
getDOM().createElementNS(
|
||||
(NAMESPACE_URIS as any /** TODO #9100 */)[nsAndName[0]], nsAndName[1]) :
|
||||
getDOM().createElement(nsAndName[1]);
|
||||
if (isPresent(this._contentAttr)) {
|
||||
getDOM().setAttribute(el, this._contentAttr, '');
|
||||
}
|
||||
@ -153,9 +134,7 @@ export class DomRenderer implements Renderer {
|
||||
appendNodes(parentElement, nodes);
|
||||
}
|
||||
|
||||
attachViewAfter(node: any, viewRootNodes: any[]) {
|
||||
moveNodesAfterSibling(node, viewRootNodes);
|
||||
}
|
||||
attachViewAfter(node: any, viewRootNodes: any[]) { moveNodesAfterSibling(node, viewRootNodes); }
|
||||
|
||||
detachView(viewRootNodes: any[]) {
|
||||
for (var i = 0; i < viewRootNodes.length; i++) {
|
||||
@ -170,13 +149,13 @@ export class DomRenderer implements Renderer {
|
||||
}
|
||||
|
||||
listen(renderElement: any, name: string, callback: Function): Function {
|
||||
return this._rootRenderer.eventManager.addEventListener(renderElement, name,
|
||||
decoratePreventDefault(callback));
|
||||
return this._rootRenderer.eventManager.addEventListener(
|
||||
renderElement, name, decoratePreventDefault(callback));
|
||||
}
|
||||
|
||||
listenGlobal(target: string, name: string, callback: Function): Function {
|
||||
return this._rootRenderer.eventManager.addGlobalEventListener(target, name,
|
||||
decoratePreventDefault(callback));
|
||||
return this._rootRenderer.eventManager.addGlobalEventListener(
|
||||
target, name, decoratePreventDefault(callback));
|
||||
}
|
||||
|
||||
setElementProperty(renderElement: any, propertyName: string, propertyValue: any): void {
|
||||
@ -213,8 +192,9 @@ export class DomRenderer implements Renderer {
|
||||
StringWrapper.replaceAll(getDOM().getText(renderElement), /\n/g, ''));
|
||||
var parsedBindings = Json.parse(existingBindings[1]);
|
||||
(parsedBindings as any /** TODO #9100 */)[dashCasedPropertyName] = propertyValue;
|
||||
getDOM().setText(renderElement, StringWrapper.replace(TEMPLATE_COMMENT_TEXT, '{}',
|
||||
Json.stringify(parsedBindings)));
|
||||
getDOM().setText(
|
||||
renderElement,
|
||||
StringWrapper.replace(TEMPLATE_COMMENT_TEXT, '{}', Json.stringify(parsedBindings)));
|
||||
} else {
|
||||
this.setElementAttribute(renderElement, propertyName, propertyValue);
|
||||
}
|
||||
@ -242,11 +222,11 @@ export class DomRenderer implements Renderer {
|
||||
|
||||
setText(renderNode: any, text: string): void { getDOM().setText(renderNode, text); }
|
||||
|
||||
animate(element: any,
|
||||
startingStyles: AnimationStyles,
|
||||
keyframes: AnimationKeyframe[], duration: number, delay: number,
|
||||
easing: string): AnimationPlayer {
|
||||
return this._animationDriver.animate(element, startingStyles, keyframes, duration, delay, easing);
|
||||
animate(
|
||||
element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[],
|
||||
duration: number, delay: number, easing: string): AnimationPlayer {
|
||||
return this._animationDriver.animate(
|
||||
element, startingStyles, keyframes, duration, delay, easing);
|
||||
}
|
||||
}
|
||||
|
||||
@ -295,7 +275,7 @@ function _shimHostAttribute(componentShortId: string): string {
|
||||
return StringWrapper.replaceAll(HOST_ATTR, COMPONENT_REGEX, componentShortId);
|
||||
}
|
||||
|
||||
function _flattenStyles(compId: string, styles: Array<any | any[]>, target: string[]): string[] {
|
||||
function _flattenStyles(compId: string, styles: Array<any|any[]>, target: string[]): string[] {
|
||||
for (var i = 0; i < styles.length; i++) {
|
||||
var style = styles[i];
|
||||
if (isArray(style)) {
|
||||
|
@ -1,10 +1,10 @@
|
||||
import {Injectable, Inject, OpaqueToken, NgZone} from '@angular/core';
|
||||
import {Inject, Injectable, NgZone, OpaqueToken} from '@angular/core';
|
||||
|
||||
import {BaseException} from '../../facade/exceptions';
|
||||
import {ListWrapper} from '../../facade/collection';
|
||||
import {BaseException} from '../../facade/exceptions';
|
||||
|
||||
|
||||
export const EVENT_MANAGER_PLUGINS: OpaqueToken = new OpaqueToken("EventManagerPlugins");
|
||||
export const EVENT_MANAGER_PLUGINS: OpaqueToken = new OpaqueToken('EventManagerPlugins');
|
||||
|
||||
@Injectable()
|
||||
export class EventManager {
|
||||
@ -47,10 +47,10 @@ export class EventManagerPlugin {
|
||||
supports(eventName: string): boolean { return false; }
|
||||
|
||||
addEventListener(element: HTMLElement, eventName: string, handler: Function): Function {
|
||||
throw "not implemented";
|
||||
throw 'not implemented';
|
||||
}
|
||||
|
||||
addGlobalEventListener(element: string, eventName: string, handler: Function): Function {
|
||||
throw "not implemented";
|
||||
throw 'not implemented';
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
import {EventManagerPlugin} from './event_manager';
|
||||
import {StringMapWrapper} from '../../facade/collection';
|
||||
|
||||
import {EventManagerPlugin} from './event_manager';
|
||||
|
||||
var _eventNames = {
|
||||
// pan
|
||||
'pan': true,
|
||||
|
@ -1,9 +1,11 @@
|
||||
import {Injectable, Inject, OpaqueToken} from '@angular/core';
|
||||
import {isPresent} from '../../facade/lang';
|
||||
import {Inject, Injectable, OpaqueToken} from '@angular/core';
|
||||
|
||||
import {BaseException} from '../../facade/exceptions';
|
||||
import {isPresent} from '../../facade/lang';
|
||||
|
||||
import {HammerGesturesPluginCommon} from './hammer_common';
|
||||
|
||||
export const HAMMER_GESTURE_CONFIG: OpaqueToken = new OpaqueToken("HammerGestureConfig");
|
||||
export const HAMMER_GESTURE_CONFIG: OpaqueToken = new OpaqueToken('HammerGestureConfig');
|
||||
|
||||
export interface HammerInstance {
|
||||
on(eventName: string, callback: Function): void;
|
||||
@ -51,7 +53,9 @@ export class HammerGesturesPlugin extends HammerGesturesPluginCommon {
|
||||
return zone.runOutsideAngular(() => {
|
||||
// Creating the manager bind events, must be done outside of angular
|
||||
var mc = this._config.buildHammer(element);
|
||||
var callback = function(eventObj: any /** TODO #???? */) { zone.runGuarded(function() { handler(eventObj); }); };
|
||||
var callback = function(eventObj: any /** TODO #???? */) {
|
||||
zone.runGuarded(function() { handler(eventObj); });
|
||||
};
|
||||
mc.on(eventName, callback);
|
||||
return () => { mc.off(eventName, callback); };
|
||||
});
|
||||
|
@ -1,8 +1,6 @@
|
||||
import {NgZone, Injectable} from '@angular/core';
|
||||
import {
|
||||
isPresent,
|
||||
StringWrapper,
|
||||
} from '../../facade/lang';
|
||||
import {Injectable, NgZone} from '@angular/core';
|
||||
|
||||
import {isPresent, StringWrapper,} from '../../facade/lang';
|
||||
import {StringMapWrapper, ListWrapper} from '../../facade/collection';
|
||||
|
||||
import {getDOM} from '../dom_adapter';
|
||||
@ -32,8 +30,8 @@ export class KeyEventsPlugin extends EventManagerPlugin {
|
||||
element, StringMapWrapper.get(parsedEvent, 'fullKey'), handler, this.manager.getZone());
|
||||
|
||||
return this.manager.getZone().runOutsideAngular(() => {
|
||||
return getDOM().onAndCancel(element, StringMapWrapper.get(parsedEvent, 'domEventName'),
|
||||
outsideHandler);
|
||||
return getDOM().onAndCancel(
|
||||
element, StringMapWrapper.get(parsedEvent, 'domEventName'), outsideHandler);
|
||||
});
|
||||
}
|
||||
|
||||
@ -89,8 +87,8 @@ export class KeyEventsPlugin extends EventManagerPlugin {
|
||||
return fullKey;
|
||||
}
|
||||
|
||||
static eventCallback(element: HTMLElement, fullKey: any, handler: Function,
|
||||
zone: NgZone): Function {
|
||||
static eventCallback(element: HTMLElement, fullKey: any, handler: Function, zone: NgZone):
|
||||
Function {
|
||||
return (event: any /** TODO #9100 */) => {
|
||||
if (StringWrapper.equals(KeyEventsPlugin.getEventFullKey(event), fullKey)) {
|
||||
zone.runGuarded(() => handler(event));
|
||||
|
@ -5,11 +5,11 @@ var DASH_CASE_REGEXP = /-([a-z])/g;
|
||||
|
||||
|
||||
export function camelCaseToDashCase(input: string): string {
|
||||
return StringWrapper.replaceAllMapped(input, CAMEL_CASE_REGEXP,
|
||||
(m: any /** TODO #9100 */) => { return '-' + m[1].toLowerCase(); });
|
||||
return StringWrapper.replaceAllMapped(
|
||||
input, CAMEL_CASE_REGEXP, (m: any /** TODO #9100 */) => { return '-' + m[1].toLowerCase(); });
|
||||
}
|
||||
|
||||
export function dashCaseToCamelCase(input: string): string {
|
||||
return StringWrapper.replaceAllMapped(input, DASH_CASE_REGEXP,
|
||||
(m: any /** TODO #9100 */) => { return m[1].toUpperCase(); });
|
||||
return StringWrapper.replaceAllMapped(
|
||||
input, DASH_CASE_REGEXP, (m: any /** TODO #9100 */) => { return m[1].toUpperCase(); });
|
||||
}
|
||||
|
@ -1,27 +1,20 @@
|
||||
import {AUTO_STYLE, BaseException} from '@angular/core';
|
||||
|
||||
import {AnimationDriver, AnimationKeyframe, AnimationPlayer, AnimationStyles, NoOpAnimationPlayer} from '../../core_private';
|
||||
import {StringMapWrapper} from '../facade/collection';
|
||||
import {isPresent, isNumber, StringWrapper} from '../facade/lang';
|
||||
import {BaseException, AUTO_STYLE} from '@angular/core';
|
||||
|
||||
import {
|
||||
AnimationDriver,
|
||||
AnimationPlayer,
|
||||
NoOpAnimationPlayer,
|
||||
AnimationKeyframe,
|
||||
AnimationStyles
|
||||
} from '../../core_private';
|
||||
|
||||
import {WebAnimationsPlayer} from './web_animations_player';
|
||||
import {StringWrapper, isNumber, isPresent} from '../facade/lang';
|
||||
|
||||
import {getDOM} from './dom_adapter';
|
||||
import {WebAnimationsPlayer} from './web_animations_player';
|
||||
|
||||
export class WebAnimationsDriver implements AnimationDriver {
|
||||
animate(element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[], duration: number, delay: number,
|
||||
easing: string): AnimationPlayer {
|
||||
|
||||
animate(
|
||||
element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[],
|
||||
duration: number, delay: number, easing: string): AnimationPlayer {
|
||||
var anyElm = <any>element;
|
||||
|
||||
var formattedSteps: any[] /** TODO #9100 */ = [];
|
||||
var startingStyleLookup: {[key: string]: string|number}= {};
|
||||
var startingStyleLookup: {[key: string]: string | number} = {};
|
||||
if (isPresent(startingStyles) && startingStyles.styles.length > 0) {
|
||||
startingStyleLookup = _populateStyles(anyElm, startingStyles, {});
|
||||
startingStyleLookup['offset'] = 0;
|
||||
@ -52,20 +45,22 @@ export class WebAnimationsDriver implements AnimationDriver {
|
||||
}
|
||||
}
|
||||
|
||||
function _populateStyles(element: any, styles: AnimationStyles, defaultStyles: {[key: string]: string|number}) {
|
||||
function _populateStyles(
|
||||
element: any, styles: AnimationStyles, defaultStyles: {[key: string]: string | number}) {
|
||||
var data = {};
|
||||
styles.styles.forEach((entry) => {
|
||||
StringMapWrapper.forEach(entry, (val: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
|
||||
(data as any /** TODO #9100 */)[prop] = val == AUTO_STYLE
|
||||
? _computeStyle(element, prop)
|
||||
: val.toString() + _resolveStyleUnit(val, prop);
|
||||
(data as any /** TODO #9100 */)[prop] = val == AUTO_STYLE ?
|
||||
_computeStyle(element, prop) :
|
||||
val.toString() + _resolveStyleUnit(val, prop);
|
||||
});
|
||||
});
|
||||
StringMapWrapper.forEach(defaultStyles, (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
|
||||
if (!isPresent((data as any /** TODO #9100 */)[prop])) {
|
||||
(data as any /** TODO #9100 */)[prop] = value;
|
||||
}
|
||||
});
|
||||
StringMapWrapper.forEach(
|
||||
defaultStyles, (value: any /** TODO #9100 */, prop: any /** TODO #9100 */) => {
|
||||
if (!isPresent((data as any /** TODO #9100 */)[prop])) {
|
||||
(data as any /** TODO #9100 */)[prop] = value;
|
||||
}
|
||||
});
|
||||
return data;
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
import {isPresent} from '../facade/lang';
|
||||
import {AnimationPlayer} from '../../core_private';
|
||||
import {isPresent} from '../facade/lang';
|
||||
|
||||
import {DomAnimatePlayer} from './dom_animate_player';
|
||||
|
||||
export class WebAnimationsPlayer implements AnimationPlayer {
|
||||
@ -47,11 +48,7 @@ export class WebAnimationsPlayer implements AnimationPlayer {
|
||||
this._onFinish();
|
||||
}
|
||||
|
||||
setPosition(p: any /** TODO #9100 */): void {
|
||||
this._player.currentTime = p * this.totalTime;
|
||||
}
|
||||
setPosition(p: any /** TODO #9100 */): void { this._player.currentTime = p * this.totalTime; }
|
||||
|
||||
getPosition(): number {
|
||||
return this._player.currentTime / this.totalTime;
|
||||
}
|
||||
getPosition(): number { return this._player.currentTime / this.totalTime; }
|
||||
}
|
||||
|
Reference in New Issue
Block a user