Fixed improper unbind implementation

atanasovg · atanasovg · commit 71af5f955db4 · 2014-06-05T14:16:35.000+03:00
diff --git a/ui/core/bindable.ts b/ui/core/bindable.ts
@@ -51,6 +51,7 @@ class Binding {
     updating = false;
     source: observable.Observable;
     target: Bindable;
+    callback: (data: observable.PropertyChangeData) => void;
 
     constructor(target: Bindable, options: BindingOptions) {
         this.target = target;
@@ -62,19 +63,19 @@ class Binding {
         this.updateTarget(this.source.getProperty(this.options.sourceProperty));
 
         var that = this;
-        var callback = function (data: observable.PropertyChangeData) {
+        this.callback = function (data: observable.PropertyChangeData) {
             that.onSourcePropertyChanged(data);
         }
 
-        this.source.addObserver(observable.Observable.propertyChangeEvent, callback);
+        this.source.addObserver(observable.Observable.propertyChangeEvent, this.callback);
     }
 
     public unbind() {
         if (!this.source) {
             return;
         }
 
-        this.source.removeObserver(observable.Observable.propertyChangeEvent, this.onSourcePropertyChanged);
+        this.source.removeObserver(observable.Observable.propertyChangeEvent, this.callback);
         this.source = undefined;
         this.target = undefined;
     }
