Skip to content

Commit fe9dc84

Browse files
richardfrosztegadanielspaniel
authored andcommitted
isKnown - info object can be undefined (#72)
Add guard to prevent the evaluation of 'known' for linked relationships when the relationship key is not being checked
1 parent a845068 commit fe9dc84

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

addon/model-ext.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Model.reopen({
142142
},
143143

144144
observeUnknownRelationshipLoaded(sender, key/*, value, rev*/) {
145-
if (Tracker.trackingIsSetup(this)) {
145+
if (Tracker.trackingIsSetup(this) && Tracker.isTracking(this, key)) {
146146
let saved = Tracker.saveLoadedRelationship(this, key);
147147
if (saved) {
148148
this.removeObserver(key, this, 'observeUnknownRelationshipLoaded');

addon/tracker.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ export default class Tracker {
126126
return info;
127127
}
128128

129+
/**
130+
* Find whether this key is currently being tracked.
131+
*
132+
* @param {DS.Model} model
133+
* @param {string} [key]
134+
* @returns {boolean} true if this key is being tracked. false otherwise
135+
*/
136+
static isTracking(model, key) {
137+
let info = (model.constructor.trackerKeys || {});
138+
return !!info[key];
139+
}
140+
129141
/**
130142
* On the model you can set options like:
131143
*

0 commit comments

Comments
 (0)