fly/fgdata
1
0
Fork 0
Code Activity

fgfs.js: remove cyclic object reference

Browse source
This commit is contained in:
Torsten Dreyer 2015-01-07 10:54:00 +01:00
parent 281469611b
commit 0e9dcbbd08
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
webgui/lib/fgfs.js
View file

@ -43,6 +43,7 @@ FGFS.Property.prototype.getNumValue = function(dflt) {
} }
FGFS.PropertyListener = function(arg) { FGFS.PropertyListener = function(arg) {
console.log("property listener created!");
this._listeners = {}; this._listeners = {};
this._nextId = 1; this._nextId = 1;
this._ws = new WebSocket('ws://' + location.host + '/PropertyListener'); this._ws = new WebSocket('ws://' + location.host + '/PropertyListener');
@ -60,13 +61,14 @@ FGFS.PropertyListener = function(arg) {
throw new Error(msg); throw new Error(msg);
} }
this._ws.propertyListener = this;
this._ws.onopen = arg.onopen; this._ws.onopen = arg.onopen;
this._ws.onclose = defaultOnClose; this._ws.onclose = defaultOnClose;
this._ws.onerror = defaultOnError; this._ws.onerror = defaultOnError;
var self = this;
this._ws.onmessage = function(ev) { this._ws.onmessage = function(ev) {
try { try {
this.propertyListener.fire(JSON.parse(ev.data)); self.fire(JSON.parse(ev.data));
} catch (e) { } catch (e) {
} }
}; };
@ -127,28 +129,26 @@ FGFS.PropertyListener = function(arg) {
// [ "key", "/another/fg/property/path" ], // [ "key", "/another/fg/property/path" ],
// ] // ]
FGFS.PropertyMirror = function(mirroredProperties) { FGFS.PropertyMirror = function(mirroredProperties) {
var mirror = {} this.mirror = {}
for( var i = 0; i < mirroredProperties.length; i++ ) { for( var i = 0; i < mirroredProperties.length; i++ ) {
var pair = mirroredProperties[i]; var pair = mirroredProperties[i];
mirror[pair[0]] = new FGFS.Property(pair[1]); this.mirror[pair[0]] = new FGFS.Property(pair[1]);
} }
var listener = new FGFS.PropertyListener({ var self = this;
this.listener = new FGFS.PropertyListener({
onopen : function() { onopen : function() {
var keys = Object.keys(mirror); var keys = Object.keys(self.mirror);
for (var i = 0; i < keys.length; i++) { for (var i = 0; i < keys.length; i++) {
listener.addProperty(mirror[keys[i]], function(n) { self.listener.addProperty(self.mirror[keys[i]], function(n) {
if (typeof (n.value) != 'undefined') if (typeof (n.value) != 'undefined')
this.prop.value = n.value; this.prop.value = n.value;
}); });
} }
; ;
}, },
}); });;
this.listener = listener;
this.mirror = mirror;
this.getNode = function(id) { this.getNode = function(id) {
return this.mirror[id]; return this.mirror[id];