Unobserved->closed

googlearchive · Aug 24, 2013 · 058d172 · 058d172
1 parent d2b20c2
commit 058d172
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/observe.js b/src/observe.js
@@ -309,8 +309,8 @@
     close: function() {
       if (this.closed)
         return;
-      if (this.object && typeof this.object.unobserved === 'function')
-        this.object.unobserved();
+      if (this.object && typeof this.object.close === 'function')
+        this.object.close();
 
       this.disconnect();
       this.object = undefined;

diff --git a/tests/test.js b/tests/test.js
@@ -131,9 +131,9 @@ suite('PathObserver Tests', function() {
     callbackInvoked = false;
   }
 
-  test('Close Invokes Unobserved', function() {
+  test('Close Invokes Close', function() {
     var called = false;
-    var obj = { foo: 1, unobserved: function() { called = true }};
+    var obj = { foo: 1, close: function() { called = true }};
     var observer = new PathObserver(obj, 'foo', function() {});
     observer.close();
     assert.isTrue(called);
@@ -775,10 +775,10 @@ suite('ArrayObserver Tests', function() {
     observer.close();
   }
 
-  test('Close Invokes Unobserved', function() {
+  test('Close Invokes Close', function() {
     var called = false;
     var obj = [];
-    obj.unobserved = function() { called = true };
+    obj.close = function() { called = true };
     var observer = new ArrayObserver(obj, function() {});
     observer.close();
     assert.isTrue(called);
@@ -1354,10 +1354,10 @@ suite('ObjectObserver Tests', function() {
     callbackInvoked = false;
   }
 
-  test('Close Invokes Unobserved', function() {
+  test('Close Invokes Close', function() {
     var called = false;
     var obj = {};
-    obj.unobserved = function() { called = true };
+    obj.close = function() { called = true };
     var observer = new ObjectObserver(obj, function() {});
     observer.close();
     assert.isTrue(called);