Merge pull request #4805 from emberjs/cleanup-from-stef

Don’t redefine findPossibleInverses for each _findInverseFor
emberjs · Feb 16, 2017 · ac659ce · ac659ce
2 parents d4772a1 + 20c5e29
commit ac659ce
Showing 1 changed file with 30 additions and 31 deletions.
diff --git a/addon/-private/system/model/model.js b/addon/-private/system/model/model.js
@@ -21,6 +21,35 @@ const {
   @module ember-data
 */
 
+
+function findPossibleInverses(type, inverseType, name, relationshipsSoFar) {
+  let possibleRelationships = relationshipsSoFar || [];
+
+  let relationshipMap = get(inverseType, 'relationships');
+  if (!relationshipMap) { return possibleRelationships; }
+
+  let relationships = relationshipMap.get(type.modelName).filter(relationship => {
+    let optionsForRelationship = inverseType.metaForProperty(relationship.name).options;
+
+    if (!optionsForRelationship.inverse) {
+      return true;
+    }
+
+    return name === optionsForRelationship.inverse;
+  });
+
+  if (relationships) {
+    possibleRelationships.push.apply(possibleRelationships, relationships);
+  }
+
+  //Recurse to support polymorphism
+  if (type.superclass) {
+    findPossibleInverses(type.superclass, inverseType, name, possibleRelationships);
+  }
+
+  return possibleRelationships;
+}
+
 function intersection (array1, array2) {
   let result = [];
   array1.forEach((element) => {
@@ -1320,7 +1349,7 @@ Model.reopenClass({
         });
       }
 
-      let possibleRelationships = findPossibleInverses(this, inverseType);
+      let possibleRelationships = findPossibleInverses(this, inverseType, name);
 
       if (possibleRelationships.length === 0) { return null; }
 
@@ -1345,36 +1374,6 @@ Model.reopenClass({
       inverseKind = possibleRelationships[0].kind;
     }
 
-    function findPossibleInverses(type, inverseType, relationshipsSoFar) {
-      let possibleRelationships = relationshipsSoFar || [];
-
-      let relationshipMap = get(inverseType, 'relationships');
-      if (!relationshipMap) { return possibleRelationships; }
-
-      let relationships = relationshipMap.get(type.modelName);
-
-      relationships = relationships.filter((relationship) => {
-        let optionsForRelationship = inverseType.metaForProperty(relationship.name).options;
-
-        if (!optionsForRelationship.inverse) {
-          return true;
-        }
-
-        return name === optionsForRelationship.inverse;
-      });
-
-      if (relationships) {
-        possibleRelationships.push.apply(possibleRelationships, relationships);
-      }
-
-      //Recurse to support polymorphism
-      if (type.superclass) {
-        findPossibleInverses(type.superclass, inverseType, possibleRelationships);
-      }
-
-      return possibleRelationships;
-    }
-
     return {
       type: inverseType,
       name: inverseName,