Merge branch 'master' of github.com:saratovsource/backbone-validation…

…-rails into saratovsource-master Conflicts: README.md
petehamilton · Aug 6, 2013 · 9ddddd3 · 9ddddd3
2 parents 549fe65 + de5551b
commit 9ddddd3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ A wrapper for the [Backbone.Validation](https://github.com/thedersen/backbone.va
 ## Version
 The version of this gem follows that of the associated Backbone.Validation version
 
-Currently: **v0.7.1**
+Currently: **v0.8.0**
 
 ## Installation
 

diff --git a/lib/backbone-validation-rails/version.rb b/lib/backbone-validation-rails/version.rb
@@ -1,7 +1,7 @@
 module Backbone
   module Validation
     module Rails
-      VERSION = "0.7.1.1"
+      VERSION = "0.8.0"
     end
   end
 end
diff --git a/vendor/assets/javascripts/backbone-validation.js b/vendor/assets/javascripts/backbone-validation.js
@@ -1,6 +1,6 @@
-// Backbone.Validation v0.7.1
+// Backbone.Validation v0.8.0
 //
-// Copyright (c) 2011-2012 Thomas Pedersen
+// Copyright (c) 2011-2013 Thomas Pedersen
 // Distributed under MIT License
 //
 // Documentation and full license available at:
@@ -64,7 +64,12 @@ Backbone.Validation = (function(_){
 
     _.each(obj, function(val, key) {
       if(obj.hasOwnProperty(key)) {
-        if (val && typeof val === 'object' && !(val instanceof Date || val instanceof RegExp)) {
+        if (val && typeof val === 'object' && !(
+          val instanceof Date ||
+          val instanceof RegExp ||
+          val instanceof Backbone.Model ||
+          val instanceof Backbone.Collection)
+        ) {
           flatten(val, into, prefix + key + '.');
         }
         else {
@@ -283,7 +288,7 @@ Backbone.Validation = (function(_){
     return {
 
       // Current version of the library
-      version: '0.7.1',
+      version: '0.8.0',
 
       // Called to configure the default options
       configure: function(options) {