iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deps): Update clang-format to 1.0.14.

Browse Source
This commit is contained in:
Martin Probst 2015-05-21 16:42:19 +02:00 committed by Tobias Bosch
parent e50f537667
commit 15f1eb28a2
15 changed files with 519 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/angular2/src/core/compiler/compiler.ts
View File

@ -175,9 +175,8 @@ export class Compiler {
var nestedPVPromises = [];
ListWrapper.forEach(this._collectComponentElementBinders(protoViews), (elementBinder) => {
var nestedComponent = elementBinder.componentDirective;
var elementBinderDone = (nestedPv: AppProtoView) => {
elementBinder.nestedProtoView = nestedPv;
};
var elementBinderDone =
(nestedPv: AppProtoView) => { elementBinder.nestedProtoView = nestedPv; };
var nestedCall = this._compile(nestedComponent);
if (PromiseWrapper.isPromise(nestedCall)) {
ListWrapper.push(nestedPVPromises,

22
modules/angular2/src/core/compiler/dynamic_component_loader.ts
View File

@ -38,7 +38,8 @@ export class DynamicComponentLoader {
loadIntoExistingLocation(typeOrBinding, location: ElementRef,
injector: Injector = null): Promise<ComponentRef> {
var binding = this._getBinding(typeOrBinding);
return this._compiler.compile(binding.token).then(componentProtoViewRef => {
return this._compiler.compile(binding.token)
.then(componentProtoViewRef => {
this._viewManager.createDynamicComponentView(location, componentProtoViewRef, binding,
injector);
var component = this._viewManager.getComponent(location);
@ -54,14 +55,14 @@ export class DynamicComponentLoader {
*/
loadAsRoot(typeOrBinding, overrideSelector = null,
injector: Injector = null): Promise<ComponentRef> {
return this._compiler.compileInHost(this._getBinding(typeOrBinding)).then(hostProtoViewRef => {
return this._compiler.compileInHost(this._getBinding(typeOrBinding))
.then(hostProtoViewRef => {
var hostViewRef =
this._viewManager.createRootHostView(hostProtoViewRef, overrideSelector, injector);
var newLocation = new ElementRef(hostViewRef, 0);
var component = this._viewManager.getComponent(newLocation);
var dispose = () => { this._viewManager.destroyRootHostView(hostViewRef);
};
var dispose = () => { this._viewManager.destroyRootHostView(hostViewRef); };
return new ComponentRef(newLocation, component, dispose);
});
}
@ -73,9 +74,10 @@ loadAsRoot(typeOrBinding, overrideSelector = null,
*/
loadIntoNewLocation(typeOrBinding, parentComponentLocation: ElementRef,
injector: Injector = null): Promise<ComponentRef> {
return this._compiler.compileInHost(this._getBinding(typeOrBinding)).then(hostProtoViewRef => {
var hostViewRef =
this._viewManager.createFreeHostView(parentComponentLocation, hostProtoViewRef, injector);
return this._compiler.compileInHost(this._getBinding(typeOrBinding))
.then(hostProtoViewRef => {
var hostViewRef = this._viewManager.createFreeHostView(parentComponentLocation,
hostProtoViewRef, injector);
var newLocation = new ElementRef(hostViewRef, 0);
var component = this._viewManager.getComponent(newLocation);
@ -95,11 +97,13 @@ loadNextToExistingLocation(typeOrBinding, location: ElementRef,
var binding = this._getBinding(typeOrBinding);
return this._compiler.compileInHost(binding).then(hostProtoViewRef => {
var viewContainer = this._viewManager.getViewContainer(location);
var hostViewRef = viewContainer.create(hostProtoViewRef, viewContainer.length, null, injector);
var hostViewRef =
viewContainer.create(hostProtoViewRef, viewContainer.length, null, injector);
var newLocation = new ElementRef(hostViewRef, 0);
var component = this._viewManager.getComponent(newLocation);
var dispose = () => { var index = viewContainer.indexOf(hostViewRef);
var dispose = () => {
var index = viewContainer.indexOf(hostViewRef);
viewContainer.remove(index);
};
return new ComponentRef(newLocation, component, dispose);

6
modules/angular2/src/core/life_cycle/life_cycle.ts
View File

@ -39,7 +39,8 @@ export class LifeCycle {
constructor(exceptionHandler: ExceptionHandler, changeDetector: ChangeDetector = null,
enforceNoNewChanges: boolean = false) {
this._errorHandler = (exception, stackTrace) => { exceptionHandler.call(exception, stackTrace);
this._errorHandler = (exception, stackTrace) => {
exceptionHandler.call(exception, stackTrace);
throw exception;
};
this._changeDetector =
@ -63,7 +64,8 @@ registerWith(zone: NgZone, changeDetector: ChangeDetector = null) {
*
* In development mode, `tick()` also performs a second change detection cycle to ensure that no
* further
* changes are detected. If additional changes are picked up during this second cycle, bindings in
* changes are detected. If additional changes are picked up during this second cycle, bindings
* in
* the app have
* side-effects that cannot be resolved in a single change detection pass. In this case, Angular
* throws an error,

243
modules/angular2/src/dom/browser_adapter.ts
View File

@ -63,12 +63,9 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
el.addEventListener(evt, listener, false);
// Needed to follow Dart's subscription semantic, until fix of
// https://code.google.com/p/dart/issues/detail?id=17406
return () => { el.removeEventListener(evt, listener, false);
};
}
dispatchEvent(el, evt) {
el.dispatchEvent(evt);
return () => { el.removeEventListener(evt, listener, false); };
}
dispatchEvent(el, evt) { el.dispatchEvent(evt); }
createMouseEvent(eventType: string): MouseEvent {
var evt: MouseEvent = document.createEvent('MouseEvent');
evt.initEvent(eventType, true, true);
@ -83,21 +80,11 @@ preventDefault(evt: Event) {
evt.preventDefault();
evt.returnValue = false;
}
getInnerHTML(el) {
return el.innerHTML;
}
getOuterHTML(el) {
return el.outerHTML;
}
nodeName(node: Node): string {
return node.nodeName;
}
nodeValue(node: Node): string {
return node.nodeValue;
}
type(node: HTMLInputElement): string {
return node.type;
}
getInnerHTML(el) { return el.innerHTML; }
getOuterHTML(el) { return el.outerHTML; }
nodeName(node: Node): string { return node.nodeName; }
nodeValue(node: Node): string { return node.nodeValue; }
type(node: HTMLInputElement): string { return node.type; }
content(node: Node): Node {
if (this.hasProperty(node, "content")) {
return (<any>node).content;
@ -105,18 +92,10 @@ content(node: Node): Node {
return node;
}
}
firstChild(el): Node {
return el.firstChild;
}
nextSibling(el): Node {
return el.nextSibling;
}
parentElement(el) {
return el.parentElement;
}
childNodes(el): List<Node> {
return el.childNodes;
}
firstChild(el): Node { return el.firstChild; }
nextSibling(el): Node { return el.nextSibling; }
parentElement(el) { return el.parentElement; }
childNodes(el): List<Node> { return el.childNodes; }
childNodesAsList(el): List<any> {
var childNodes = el.childNodes;
var res = ListWrapper.createFixedSize(childNodes.length);
@ -130,62 +109,34 @@ clearNodes(el) {
this.remove(el.childNodes[i]);
}
}
appendChild(el, node) {
el.appendChild(node);
}
removeChild(el, node) {
el.removeChild(node);
}
replaceChild(el: Node, newChild, oldChild) {
el.replaceChild(newChild, oldChild);
}
appendChild(el, node) { el.appendChild(node); }
removeChild(el, node) { el.removeChild(node); }
replaceChild(el: Node, newChild, oldChild) { el.replaceChild(newChild, oldChild); }
remove(el) {
var parent = el.parentNode;
parent.removeChild(el);
return el;
}
insertBefore(el, node) {
el.parentNode.insertBefore(node, el);
}
insertBefore(el, node) { el.parentNode.insertBefore(node, el); }
insertAllBefore(el, nodes) {
ListWrapper.forEach(nodes, (n) => { el.parentNode.insertBefore(n, el); });
}
insertAfter(el, node) {
el.parentNode.insertBefore(node, el.nextSibling);
}
setInnerHTML(el, value) {
el.innerHTML = value;
}
getText(el) {
return el.textContent;
}
insertAfter(el, node) { el.parentNode.insertBefore(node, el.nextSibling); }
setInnerHTML(el, value) { el.innerHTML = value; }
getText(el) { return el.textContent; }
// TODO(vicb): removed Element type because it does not support StyleElement
setText(el, value: string) {
el.textContent = value;
}
getValue(el) {
return el.value;
}
setValue(el, value: string) {
el.value = value;
}
getChecked(el) {
return el.checked;
}
setChecked(el, value: boolean) {
el.checked = value;
}
setText(el, value: string) { el.textContent = value; }
getValue(el) { return el.value; }
setValue(el, value: string) { el.value = value; }
getChecked(el) { return el.checked; }
setChecked(el, value: boolean) { el.checked = value; }
createTemplate(html): HTMLElement {
var t = document.createElement('template');
t.innerHTML = html;
return t;
}
createElement(tagName, doc = document): HTMLElement {
return doc.createElement(tagName);
}
createTextNode(text: string, doc = document): Text {
return doc.createTextNode(text);
}
createElement(tagName, doc = document): HTMLElement { return doc.createElement(tagName); }
createTextNode(text: string, doc = document): Text { return doc.createTextNode(text); }
createScriptTag(attrName: string, attrValue: string, doc = document): HTMLScriptElement {
var el = <HTMLScriptElement>doc.createElement('SCRIPT');
el.setAttribute(attrName, attrValue);
@ -196,51 +147,25 @@ createStyleElement(css: string, doc = document): HTMLStyleElement {
this.appendChild(style, this.createTextNode(css));
return style;
}
createShadowRoot(el: HTMLElement): DocumentFragment {
return (<any>el).createShadowRoot();
}
getShadowRoot(el: HTMLElement): DocumentFragment {
return (<any>el).shadowRoot;
}
getHost(el: HTMLElement): HTMLElement {
return (<any>el).host;
}
clone(node: Node) {
return node.cloneNode(true);
}
hasProperty(element, name: string) {
return name in element;
}
getElementsByClassName(element, name: string) {
return element.getElementsByClassName(name);
}
getElementsByTagName(element, name: string) {
return element.getElementsByTagName(name);
}
createShadowRoot(el: HTMLElement): DocumentFragment { return (<any>el).createShadowRoot(); }
getShadowRoot(el: HTMLElement): DocumentFragment { return (<any>el).shadowRoot; }
getHost(el: HTMLElement): HTMLElement { return (<any>el).host; }
clone(node: Node) { return node.cloneNode(true); }
hasProperty(element, name: string) { return name in element; }
getElementsByClassName(element, name: string) { return element.getElementsByClassName(name); }
getElementsByTagName(element, name: string) { return element.getElementsByTagName(name); }
classList(element): List<any> {
return <List<any>>Array.prototype.slice.call(element.classList, 0);
}
addClass(element, classname: string) {
element.classList.add(classname);
}
removeClass(element, classname: string) {
element.classList.remove(classname);
}
hasClass(element, classname: string) {
return element.classList.contains(classname);
}
addClass(element, classname: string) { element.classList.add(classname); }
removeClass(element, classname: string) { element.classList.remove(classname); }
hasClass(element, classname: string) { return element.classList.contains(classname); }
setStyle(element, stylename: string, stylevalue: string) {
element.style[stylename] = stylevalue;
}
removeStyle(element, stylename: string) {
element.style[stylename] = null;
}
getStyle(element, stylename: string) {
return element.style[stylename];
}
tagName(element): string {
return element.tagName;
}
removeStyle(element, stylename: string) { element.style[stylename] = null; }
getStyle(element, stylename: string) { return element.style[stylename]; }
tagName(element): string { return element.tagName; }
attributeMap(element) {
var res = MapWrapper.create();
var elAttrs = element.attributes;
@ -250,27 +175,13 @@ attributeMap(element) {
}
return res;
}
hasAttribute(element, attribute: string) {
return element.hasAttribute(attribute);
}
getAttribute(element, attribute: string) {
return element.getAttribute(attribute);
}
setAttribute(element, name: string, value: string) {
element.setAttribute(name, value);
}
removeAttribute(element, attribute: string) {
return element.removeAttribute(attribute);
}
templateAwareRoot(el) {
return this.isTemplateElement(el) ? this.content(el) : el;
}
createHtmlDocument() {
return document.implementation.createHTMLDocument('fakeTitle');
}
defaultDoc() {
return document;
}
hasAttribute(element, attribute: string) { return element.hasAttribute(attribute); }
getAttribute(element, attribute: string) { return element.getAttribute(attribute); }
setAttribute(element, name: string, value: string) { element.setAttribute(name, value); }
removeAttribute(element, attribute: string) { return element.removeAttribute(attribute); }
templateAwareRoot(el) { return this.isTemplateElement(el) ? this.content(el) : el; }
createHtmlDocument() { return document.implementation.createHTMLDocument('fakeTitle'); }
defaultDoc() { return document; }
getBoundingClientRect(el) {
try {
return el.getBoundingClientRect();
@ -278,12 +189,8 @@ getBoundingClientRect(el) {
return {top: 0, bottom: 0, left: 0, right: 0, width: 0, height: 0};
}
}
getTitle(): string {
return document.title;
}
setTitle(newTitle: string) {
document.title = newTitle || '';
}
getTitle(): string { return document.title; }
setTitle(newTitle: string) { document.title = newTitle || ''; }
elementMatches(n, selector: string): boolean {
return n instanceof HTMLElement && n.matches ? n.matches(selector) :
n.msMatchesSelector(selector);
@ -291,21 +198,11 @@ elementMatches(n, selector: string): boolean {
isTemplateElement(el: any): boolean {
return el instanceof HTMLElement && el.nodeName == "TEMPLATE";
}
isTextNode(node: Node): boolean {
return node.nodeType === Node.TEXT_NODE;
}
isCommentNode(node: Node): boolean {
return node.nodeType === Node.COMMENT_NODE;
}
isElementNode(node: Node): boolean {
return node.nodeType === Node.ELEMENT_NODE;
}
hasShadowRoot(node): boolean {
return node instanceof HTMLElement && isPresent(node.shadowRoot);
}
isShadowRoot(node): boolean {
return node instanceof DocumentFragment;
}
isTextNode(node: Node): boolean { return node.nodeType === Node.TEXT_NODE; }
isCommentNode(node: Node): boolean { return node.nodeType === Node.COMMENT_NODE; }
isElementNode(node: Node): boolean { return node.nodeType === Node.ELEMENT_NODE; }
hasShadowRoot(node): boolean { return node instanceof HTMLElement && isPresent(node.shadowRoot); }
isShadowRoot(node): boolean { return node instanceof DocumentFragment; }
importIntoDoc(node: Node) {
var toImport = node;
if (this.isTemplateElement(node)) {
@ -313,21 +210,11 @@ importIntoDoc(node: Node) {
}
return document.importNode(toImport, true);
}
isPageRule(rule): boolean {
return rule.type === CSSRule.PAGE_RULE;
}
isStyleRule(rule): boolean {
return rule.type === CSSRule.STYLE_RULE;
}
isMediaRule(rule): boolean {
return rule.type === CSSRule.MEDIA_RULE;
}
isKeyframesRule(rule): boolean {
return rule.type === CSSRule.KEYFRAMES_RULE;
}
getHref(el: Element): string {
return (<any>el).href;
}
isPageRule(rule): boolean { return rule.type === CSSRule.PAGE_RULE; }
isStyleRule(rule): boolean { return rule.type === CSSRule.STYLE_RULE; }
isMediaRule(rule): boolean { return rule.type === CSSRule.MEDIA_RULE; }
isKeyframesRule(rule): boolean { return rule.type === CSSRule.KEYFRAMES_RULE; }
getHref(el: Element): string { return (<any>el).href; }
getEventKey(event): string {
var key = event.key;
if (isBlank(key)) {
@ -363,18 +250,10 @@ getGlobalEventTarget(target: string): EventTarget {
return document.body;
}
}
getHistory() {
return window.history;
}
getLocation() {
return window.location;
}
getBaseHref() {
return relativePath(document.baseURI);
}
getUserAgent(): string {
return window.navigator.userAgent;
}
getHistory() { return window.history; }
getLocation() { return window.location; }
getBaseHref() { return relativePath(document.baseURI); }
getUserAgent(): string { return window.navigator.userAgent; }
}
// based on urlUtils.js in AngularJS 1

7
modules/angular2/src/render/dom/compiler/selector.ts
View File

@ -36,8 +36,9 @@ export class CssSelector {
if (isPresent(cssSel.notSelector) && isBlank(cssSel.element) &&
ListWrapper.isEmpty(cssSel.classNames) && ListWrapper.isEmpty(cssSel.attrs)) {
cssSel.element = "*";
} ListWrapper.push(res, cssSel);
}
ListWrapper.push(res, cssSel);
};
var cssSelector = new CssSelector();
var matcher = RegExpWrapper.matcher(_SELECTOR_REGEXP, selector);
var match;
@ -97,9 +98,7 @@ addAttribute(name: string, value: string = _EMPTY_ATTR_VALUE) {
ListWrapper.push(this.attrs, value);
}
addClassName(name: string) {
ListWrapper.push(this.classNames, name.toLowerCase());
}
addClassName(name: string) { ListWrapper.push(this.classNames, name.toLowerCase()); }
toString(): string {
var res = '';

6
modules/angular2/src/render/dom/events/event_manager.ts
View File

@ -96,7 +96,11 @@ export class DomEventsPlugin extends EventManagerPlugin {
}
static sameElementCallback(element, handler, zone) {
return (event) => { if (event.target === element) { zone.run(() => handler(event)); } };
return (event) => {
if (event.target === element) {
zone.run(() => handler(event));
}
};
}
static bubbleCallback(element, handler, zone) {

3
modules/angular2/src/render/dom/events/key_events.ts
View File

@ -89,7 +89,8 @@ export class KeyEventsPlugin extends EventManagerPlugin {
}
static eventCallback(element, shouldSupportBubble, fullKey, handler, zone) {
return (event) => { var correctElement = shouldSupportBubble || event.target === element;
return (event) => {
var correctElement = shouldSupportBubble || event.target === element;
if (correctElement && KeyEventsPlugin.getEventFullKey(event) === fullKey) {
zone.run(() => handler(event));
}

4
modules/angular2/src/test_lib/test_lib.ts
View File

@ -331,7 +331,9 @@ export class SpyObject {
}
function elementText(n) {
var hasNodes = (n) => { var children = DOM.childNodes(n);
var hasNodes = (n) =>
{
var children = DOM.childNodes(n);
return children && children.length > 0;
}

4
modules/angular2/src/test_lib/utils.ts
View File

@ -16,9 +16,7 @@ export class Log {
}
}
result(): string {
return ListWrapper.join(this._result, "; ");
}
result(): string { return ListWrapper.join(this._result, "; "); }
}
export function viewRootNodes(view): List</*node*/ any> {

4
npm-shrinkwrap.clean.json
View File

@ -3934,7 +3934,7 @@
}
},
"gulp-clang-format": {
"version": "1.0.12",
"version": "1.0.13",
"dependencies": {
"gulp-util": {
"version": "3.0.4",
@ -4112,7 +4112,7 @@
}
},
"clang-format": {
"version": "1.0.12"
"version": "1.0.14"
}
}
},

12
npm-shrinkwrap.json generated
View File

@ -6073,9 +6073,9 @@
}
},
"gulp-clang-format": {
"version": "1.0.12",
"from": "https://registry.npmjs.org/gulp-clang-format/-/gulp-clang-format-1.0.12.tgz",
"resolved": "https://registry.npmjs.org/gulp-clang-format/-/gulp-clang-format-1.0.12.tgz",
"version": "1.0.13",
"from": "https://registry.npmjs.org/gulp-clang-format/-/gulp-clang-format-1.0.13.tgz",
"resolved": "https://registry.npmjs.org/gulp-clang-format/-/gulp-clang-format-1.0.13.tgz",
"dependencies": {
"gulp-util": {
"version": "3.0.4",
@ -6351,9 +6351,9 @@
}
},
"clang-format": {
"version": "1.0.12",
"from": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.12.tgz",
"resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.12.tgz"
"version": "1.0.14",
"from": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.14.tgz",
"resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.14.tgz"
}
}
},

2
package.json
View File

@ -64,7 +64,7 @@
"gulp": "^3.8.8",
"gulp-autoprefixer": "^2.1.0",
"gulp-changed": "^1.0.0",
"gulp-clang-format": "^1.0.12",
"gulp-clang-format": "^1.0.13",
"gulp-concat": "^2.5.2",
"gulp-connect": "~1.0.5",
"gulp-load-plugins": "^0.7.1",