Merge branch 'patch-1' of git://github.com/akshaddhoke/backbone.valid…

…ation into akshaddhoke-patch-1
zenput · May 8, 2015 · 1b949ca · 1b949ca
2 parents 05078b7 + 0a3fb49
commit 1b949ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/backbone-validation.js b/src/backbone-validation.js
@@ -330,7 +330,7 @@ Backbone.Validation = (function(_){
     // Removes view from associated views of the model or the methods
     // added to a model if no view or single view provided
     var unbindModel = function(model, view) {
-      if (view && model.associatedViews.length > 1){
+      if (view && model.associatedViews && model.associatedViews.length > 1){
         model.associatedViews = _.without(model.associatedViews, view);
       } else {
         delete model.validate;

diff --git a/tests/general.js b/tests/general.js
@@ -52,6 +52,13 @@ buster.testCase("Backbone.Validation", {
         }
     },
 
+    "when unbinding view which was not bound": {
+        "nothing happens": function(){
+            Backbone.Validation.unbind(new Backbone.View({model:new Backbone.Model()}));
+            assert(true);
+        }
+    },
+
     "when bound to model with two validated attributes": {
         setUp: function() {
             Backbone.Validation.bind(this.view);