Build

build/backbone.supermodel.amd.js

@@ -84,6 +84,26 @@
       }
     };
 
+    var getRelation = function(obj, attr, value) {
+      var relation;
+
+      if (attr) {
+        var relations = _.result(obj, 'relations');
+        relation = relations[attr];
+      }
+
+      if (value && !relation) {
+        relation = Model;
+      }
+
+      // catch all the weird stuff
+      if (relation == void 0) {
+        relation = Model;
+      }
+
+      return relation;
+    };
+
     // a simple object is an object that does not come from "new"
     var isSimpleObject = function(value) {
       return Object.getPrototypeOf(Object.getPrototypeOf(value)) === null;
@@ -94,26 +114,6 @@
       unsafeAttributes: [],
       name: null, // set name so that children can refer back to
 
-      _getRelation: function(attr, value) {
-        var relation;
-
-        if (attr) {
-          var relations = _.result(this, 'relations');
-          relation = relations[attr];
-        }
-
-        if (value && !relation) {
-          relation = Model;
-        }
-
-        // catch all the weird stuff
-        if (typeof(relation) == 'undefined') {
-          relation = Model;
-        }
-
-        return relation;
-      },
-
       _setupBackref: function(instance, options) {
         var name = _.result(this, 'name');
         // respect the attribute with the same name in relation
@@ -146,7 +146,7 @@
           if (!check) {
             // initiate the relationship here
             //var relation = Backbone.Model;
-            var relation = this._getRelation(key, value);
+            var relation = getRelation(obj, key, value);
             var instance = new relation();
             obj.attributes[key] = this._setupBackref(instance, options);
           }
@@ -163,7 +163,7 @@
         } else {
           if (this._valueForCollection(value)) {
             // here we need to initiate the collection manually
-            var _relation = this._getRelation(finalPath, value);
+            var _relation = getRelation(obj, finalPath, value);
 
             if (_relation.prototype instanceof Backbone.Model) {
               // if we dont have the Collection relation for this, use custom Collection

build/backbone.supermodel.js

@@ -74,6 +74,26 @@ Backbone.SuperModel = (function(_, Backbone){
     }
   };
 
+  var getRelation = function(obj, attr, value) {
+    var relation;
+
+    if (attr) {
+      var relations = _.result(obj, 'relations');
+      relation = relations[attr];
+    }
+
+    if (value && !relation) {
+      relation = Model;
+    }
+
+    // catch all the weird stuff
+    if (relation == void 0) {
+      relation = Model;
+    }
+
+    return relation;
+  };
+
   // a simple object is an object that does not come from "new"
   var isSimpleObject = function(value) {
     return Object.getPrototypeOf(Object.getPrototypeOf(value)) === null;
@@ -84,26 +104,6 @@ Backbone.SuperModel = (function(_, Backbone){
     unsafeAttributes: [],
     name: null, // set name so that children can refer back to
 
-    _getRelation: function(attr, value) {
-      var relation;
-
-      if (attr) {
-        var relations = _.result(this, 'relations');
-        relation = relations[attr];
-      }
-
-      if (value && !relation) {
-        relation = Model;
-      }
-
-      // catch all the weird stuff
-      if (typeof(relation) == 'undefined') {
-        relation = Model;
-      }
-
-      return relation;
-    },
-
     _setupBackref: function(instance, options) {
       var name = _.result(this, 'name');
       // respect the attribute with the same name in relation
@@ -136,7 +136,7 @@ Backbone.SuperModel = (function(_, Backbone){
         if (!check) {
           // initiate the relationship here
           //var relation = Backbone.Model;
-          var relation = this._getRelation(key, value);
+          var relation = getRelation(obj, key, value);
           var instance = new relation();
           obj.attributes[key] = this._setupBackref(instance, options);
         }
@@ -153,7 +153,7 @@ Backbone.SuperModel = (function(_, Backbone){
       } else {
         if (this._valueForCollection(value)) {
           // here we need to initiate the collection manually
-          var _relation = this._getRelation(finalPath, value);
+          var _relation = getRelation(obj, finalPath, value);
 
           if (_relation.prototype instanceof Backbone.Model) {
             // if we dont have the Collection relation for this, use custom Collection