Skip to content

Commit 002dc54

Browse files
committed
(diff-array): Update the use of diffQueryOrderedChanges after minimongo separation in Meteor 1.2
1 parent d0d573d commit 002dc54

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

lib/diff-array.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ module.factory('diffArray', ['getUpdates',
1010
// Calculates the differences between `lastSeqArray` and
1111
// `seqArray` and calls appropriate functions from `callbacks`.
1212
// Reuses Minimongo's diff algorithm implementation.
13+
// XXX Should be replaced with the original diffArray function here:
14+
// https://github.com/meteor/meteor/blob/devel/packages/observe-sequence/observe_sequence.js#L152
15+
// When it will become nested as well, tracking here: https://github.com/meteor/meteor/issues/3764
1316
function diffArray(lastSeqArray, seqArray, callbacks, preventNestedDiff) {
1417
preventNestedDiff = !!preventNestedDiff;
15-
var diffFn = Package.minimongo.LocalCollection._diffQueryOrderedChanges;
18+
19+
var diffFn = Package.minimongo.LocalCollection._diffQueryOrderedChanges ||
20+
Package['diff-sequence'].DiffSequence.diffQueryOrderedChanges;
21+
1622
var oldObjIds = [];
1723
var newObjIds = [];
1824
var posOld = {}; // maps from idStringify'd ids

package.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ Package.on_use(function (api) {
3131

3232
api.use('angular:angular@1.4.4', 'client');
3333
api.use('minimongo');
34+
// Since commit b3096e93661bc79bab73a63bae0e14643030a9a3, MongoId and
35+
// diff-sequence are separate packages from minimongo.
36+
// We need to use it for idParse, idStringify and diffQueryOrderedChanges
37+
// in lib/diff-array.js
38+
if (Package['diff-sequence']) {
39+
api.use('diff-sequence');
40+
}
3441
if (Package['mongo-id']) {
35-
// Since commit b3096e93661bc79bab73a63bae0e14643030a9a3, MongoId is
36-
// in a separate package. We need to use it for idParse and idStringify.
3742
api.use('mongo-id');
3843
}
39-
api.use('observe-sequence');
4044
api.use('dburles:mongo-collection-instances@0.3.4', 'client'); // For getCollectionByName
4145

4246
// Files to load in Client only.

0 commit comments

Comments
 (0)