Skip to content
Snippets Groups Projects
Commit f67b8789 authored by francois.grand's avatar francois.grand
Browse files

classe Observable : suppression du setter sender()

parent 4565423c
No related branches found
No related tags found
1 merge request!12Resolve "Ajout de la calculette "Ouvrages hydrauliques""
......@@ -81,7 +81,6 @@ export class NgParameter extends InputField implements IObservable {
constructor(private _paramDef: ParamDefinition, formId: number) {
super(_paramDef.computeNodeType, _paramDef.symbol, formId);
this._observable = new Observable();
this._observable.sender = this;
}
get symbol(): string {
......@@ -305,6 +304,6 @@ export class NgParameter extends InputField implements IObservable {
* notifie un événement aux observateurs
*/
public notifyObservers(data: any) {
this._observable.notifyObservers(data);
this._observable.notifyObservers(data, this);
}
}
......@@ -16,21 +16,14 @@ export interface IObservable {
/**
* notifie un événement aux observateurs
*/
notifyObservers(data: any);
notifyObservers(data: any, sender?: any);
}
export class Observable implements IObservable {
private _observers: Observer[];
private _sender: IObservable;
constructor() {
this._observers = [];
this._sender = this;
}
public set sender(s: IObservable) {
this._sender = s;
}
/**
......@@ -51,8 +44,10 @@ export class Observable implements IObservable {
/**
* notifie un événement aux observateurs
*/
public notifyObservers(data: any) {
public notifyObservers(data: any, sender?: any) {
if (sender == undefined)
sender = this;
for (let o of this._observers)
o.update(this._sender, data);
o.update(sender, data);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment