Changeset 17091 for lang/javascript/watch

Timestamp:

08/05/08 12:12:24 (5 years ago)

Author:

os0x

Message:

• binding
  

Files:

• lang/javascript/watch/watch.js (modified) (1 diff)

lang/javascript/watch/watch.js

@@ -5 +5 @@
     var getter = this.__lookupGetter__(prop),
       setter = this.__lookupSetter__(prop),
-      oldval = this[prop];
+      oldval = this[prop],
+      self = this;
     if (!(prop in watched)) {
       watched[prop] = {
         setter: setter,
         getter: getter,
+        self:self
       };
     }
     this.__defineSetter__(prop,
       function(newval) {
-        var setter = watched[prop].setter;
-        return oldval = setter?
-          setter(handler(prop, oldval, newval)):
+        var setter = watched[prop].setter,
+        self = watched[prop].self;
+        return typeof setter == "function" ?
+          setter.call(self,handler(prop, oldval, newval)) :
           handler(prop, oldval, newval);
       });
     this.__defineGetter__(prop,
       function() {
-        var getter = watched[prop].getter;
-        return getter? getter(): oldval;
+        var getter = watched[prop].getter,
+        self = watched[prop].self;
+        return typeof getter == "function" ? getter.call(self): oldval;
       });
   }
   Object.prototype.unwatch = function(prop, handler) {
-    var setter,
-      getter;
+    var setter, getter;
     if (!(prop in watched)) return;
     delete this[prop];