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

Avoid unnecessary equality comparison in clearField.

Browse Source 
Minor test changes.
This commit is contained in:
David Glasser
2012-12-11 17:26:56 -08:00
parent 81940c9859
commit 6cc809b956
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/livedata/livedata_server.js
View File

@@ -20,11 +20,14 @@ _.extend(Meteor._SessionDocumentView.prototype, {
if (!precedenceList) {
throw new Error("Could not find field to clear " + key);
}
var old = precedenceList[0];
var precedence;
var removedValue = undefined;
for (var i = 0; i < precedenceList.length; i++) {
precedence = precedenceList[i];
var precedence = precedenceList[i];
if (precedence.subscriptionId === subscriptionId) {
// The view's value can only change if this subscription is the one that
// used to have precedence.
if (i === 0)
removedValue = precedence.value;
precedenceList.splice(i, 1);
break;
}
@@ -32,7 +35,8 @@ _.extend(Meteor._SessionDocumentView.prototype, {
if (_.isEmpty(precedenceList)) {
delete self.dataByKey[key];
clearCollector.push(key);
} else if (!_.isEqual(old.value, precedenceList[0].value)) {
} else if (removedValue !== undefined &&
!_.isEqual(removedValue, precedenceList[0].value)) {
changeCollector[key] = precedenceList[0].value;
}
},

30
packages/livedata/session_view_tests.js
View File

@@ -11,25 +11,25 @@ var newView = function(test) {
results.push({fun: 'removed', ids: ids});
}
});
var ret = {
var v = {
view: view,
results: results
};
_.each(["added", "changed", "removed"], function (it) {
ret[it] = _.bind(view[it], view);
v[it] = _.bind(view[it], view);
});
ret.expectResult = function (result) {
v.expectResult = function (result) {
test.equal(results.shift(), result);
};
ret.expectNoResult = function () {
v.expectNoResult = function () {
test.equal(results, []);
};
ret.drain = function() {
v.drain = function() {
var ret = results;
results = [];
return ret;
};
return ret;
return v;
};
Tinytest.add('livedata - sessionview - exists reveal', function (test) {
@@ -150,7 +150,7 @@ Tinytest.add('livedata - sessionview - field clear reveal', function (test) {
v.expectNoResult();
});
Tinytest.add('livedata - sessionview - change to cannonical value produces no change', function (test) {
Tinytest.add('livedata - sessionview - change to canonical value produces no change', function (test) {
var v = newView(test);
v.added("A", {_id: "A1", foo: "bar"});
@@ -159,13 +159,17 @@ Tinytest.add('livedata - sessionview - change to cannonical value produces no ch
v.added("B", {_id: "A1", foo: "baz"});
var cannon = "bar";
if (!_.isEmpty(v.drain())) {
var canon = "bar";
var maybeResults = v.drain();
if (!_.isEmpty(maybeResults)) {
// if something happened, it was a change message to baz.
// if nothing did, cannon is still bar.
cannon = "baz";
// if nothing did, canon is still bar.
test.length(maybeResults, 1);
test.equal(maybeResults[0], {fun: 'added', id: "A1", changed: {foo: "baz"},
cleared: []});
canon = "baz";
}
v.changed("B", "A1", {foo: cannon}, []);
v.changed("B", "A1", {foo: canon}, []);
v.expectNoResult();
v.removed("A", ["A1"]);
@@ -175,7 +179,7 @@ Tinytest.add('livedata - sessionview - change to cannonical value produces no ch
v.expectNoResult();
});
Tinytest.add('livedata - sessionview - new field of cannonical value produces no change', function (test) {
Tinytest.add('livedata - sessionview - new field of canonical value produces no change', function (test) {
var v = newView(test);
v.added("A", {_id: "A1", foo: "bar"});