Merge branch 'master' of github.com:knockout/knockout

knockout · Oct 4, 2017 · d7fc725 · d7fc725
2 parents 0003397 + f916d57
commit d7fc725
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/spec/asyncBehaviors.js b/spec/asyncBehaviors.js
@@ -218,6 +218,11 @@ describe('Rate-limited', function() {
             jasmine.Clock.tick(250);
             expect(notifySpy).toHaveBeenCalledWith('b');
         });
+
+        it('Should return "[object Object]" with .toString', function() {
+          // Issue #2252: make sure .toString method does not throw error
+          expect(new ko.subscribable().toString()).toBe('[object Object]')
+        });
     });
 
     describe('Observable', function() {

diff --git a/src/subscribables/subscribable.js b/src/subscribables/subscribable.js
@@ -163,6 +163,10 @@ var ko_subscribable_fn = {
         return !this['equalityComparer'] || !this['equalityComparer'](oldValue, newValue);
     },
 
+    toString: function() {
+      return '[object Object]'
+    },
+
     extend: applyExtenders
 };