github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify added code, fix a bug where we were doubling sending _id on the wire

Browse Source
This commit is contained in:
Naomi Seyfer
2012-12-14 15:32:28 -08:00
committed by David Glasser
parent e2129a8559
commit c2e80dbdac
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/livedata/livedata_server.js
View File

@@ -88,10 +88,11 @@ _.extend(Meteor._SessionDocumentView.prototype, {
}
var precedenceList = self.dataByKey[key];
var elt;
if (!isAdd)
if (!isAdd) {
elt = _.find(precedenceList, function (precedence) {
return precedence.subscriptionId === subscriptionId;
});
}
if (elt) {
if (elt === precedenceList[0] && !_.isEqual(value, elt.value)) {
@@ -161,32 +162,21 @@ _.extend(Meteor._SessionCollectionView.prototype, {
added: function (subscriptionId, id, fields) {
var self = this;
var docView = self.documents[id];
if (docView) {
// somebody else knew about this doc; reconcile. The effective order of
// precedence here is that the first subscription to say anything about a
// key determines its value.
if (_.has(docView.existsIn, subscriptionId)) {
throw new Error("Duplicate add for " + id);
}
docView.existsIn[subscriptionId] = true;
var changeCollector = {};
_.each(fields, function (value, key) {
docView.changeField(subscriptionId, key, value, changeCollector, true);
});
self.callbacks.changed(self.collectionName, id, changeCollector, []);
} else {
var added = false;
if (!docView) {
added = true;
docView = new Meteor._SessionDocumentView();
self.documents[id] = docView;
docView.existsIn[subscriptionId] = true;
_.each(fields, function (value, key) {
if (key !== "_id")
docView.dataByKey[key] = [{subscriptionId: subscriptionId, value: value}];
});
// since nobody else knew about this doc, we can just call added.
self.callbacks.added(self.collectionName, id, fields);
}
docView.existsIn[subscriptionId] = true;
var changeCollector = {};
_.each(fields, function (value, key) {
docView.changeField(subscriptionId, key, value, changeCollector, true);
});
if (added)
self.callbacks.added(self.collectionName, id, changeCollector);
else
self.callbacks.changed(self.collectionName, id, changeCollector, []);
},
changed: function (subscriptionId, id, changed, cleared) {