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

refactor(pipes): removed pipes from properties

Browse Source 
BREAKING CHANGE:

This PR remove an ability to use pipes in the properties config. Instead, inject the pipe registry.
This commit is contained in:
vsavkin
2015-06-18 15:40:12 -07:00
parent ad7aca631d
commit 20a8f0dbe5
31 changed files with 261 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/angular2/src/directives/class.ts
View File

@ -8,12 +8,17 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
export class CSSClass {
_domEl;
_pipe;
_prevRawClass;
rawClass;
_rawClass;
constructor(private _pipeRegistry: PipeRegistry, ngEl: ElementRef) {
this._domEl = ngEl.domElement;
}
set rawClass(v) {
this._rawClass = v;
this._pipe = this._pipeRegistry.get('keyValDiff', this._rawClass);
}
_toggleClass(className, enabled): void {
if (enabled) {
DOM.addClass(this._domEl, className);
@ -23,19 +28,15 @@ export class CSSClass {
}
onCheck() {
if (this.rawClass != this._prevRawClass) {
this._prevRawClass = this.rawClass;
this._pipe = isPresent(this.rawClass) ?
this._pipeRegistry.get('keyValDiff', this.rawClass, null) :
null;
}
var diff = this._pipe.transform(this._rawClass);
if (isPresent(diff)) this._applyChanges(diff.wrapped);
}
if (isPresent(this._pipe) && this._pipe.check(this.rawClass)) {
this._pipe.forEachAddedItem(
(record) => { this._toggleClass(record.key, record.currentValue); });
this._pipe.forEachChangedItem(
(record) => { this._toggleClass(record.key, record.currentValue); });
this._pipe.forEachRemovedItem((record) => {
private _applyChanges(diff) {
if (isPresent(diff)) {
diff.forEachAddedItem((record) => { this._toggleClass(record.key, record.currentValue); });
diff.forEachChangedItem((record) => { this._toggleClass(record.key, record.currentValue); });
diff.forEachRemovedItem((record) => {
if (record.previousValue) {
DOM.removeClass(this._domEl, record.key);
}

37
modules/angular2/src/directives/ng_for.ts
View File

@ -1,5 +1,12 @@
import {Directive} from 'angular2/annotations';
import {ViewContainerRef, ViewRef, ProtoViewRef} from 'angular2/core';
import {
ViewContainerRef,
ViewRef,
ProtoViewRef,
PipeRegistry,
onCheck,
Pipe
} from 'angular2/angular2';
import {isPresent, isBlank} from 'angular2/src/facade/lang';
/**
@ -34,17 +41,25 @@ import {isPresent, isBlank} from 'angular2/src/facade/lang';
*
* @exportedAs angular2/directives
*/
@Directive(
{selector: '[ng-for][ng-for-of]', properties: ['iterableChanges: ngForOf | iterableDiff']})
@Directive({selector: '[ng-for][ng-for-of]', properties: ['ngForOf'], lifecycle: [onCheck]})
export class NgFor {
viewContainer: ViewContainerRef;
protoViewRef: ProtoViewRef;
constructor(viewContainer: ViewContainerRef, protoViewRef: ProtoViewRef) {
this.viewContainer = viewContainer;
this.protoViewRef = protoViewRef;
_ngForOf: any;
_pipe: Pipe;
constructor(private viewContainer: ViewContainerRef, private protoViewRef: ProtoViewRef,
private pipes: PipeRegistry) {}
set ngForOf(value: any) {
this._ngForOf = value;
this._pipe = this.pipes.get("iterableDiff", value, null, this._pipe);
}
set iterableChanges(changes) {
onCheck() {
var diff = this._pipe.transform(this._ngForOf);
if (isPresent(diff)) this._applyChanges(diff.wrapped);
}
private _applyChanges(changes) {
if (isBlank(changes)) {
this.viewContainer.clear();
return;
@ -67,11 +82,11 @@ export class NgFor {
NgFor.bulkInsert(insertTuples, this.viewContainer, this.protoViewRef);
for (var i = 0; i < insertTuples.length; i++) {
this.perViewChange(insertTuples[i].view, insertTuples[i].record);
this._perViewChange(insertTuples[i].view, insertTuples[i].record);
}
}
perViewChange(view, record) {
private _perViewChange(view, record) {
view.setLocal('\$implicit', record.item);
view.setLocal('index', record.currentIndex);
}