Skip to content
This repository was archived by the owner on Jan 12, 2019. It is now read-only.

fix(Paginate) : correct startAt if orderByKey #93

Open
pdesgarets wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(Paginate) : correct startAt if orderByKey #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Paginate/libs/Offset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Offset.prototype.goTo = function(newOffset) {
Offset.prototype.observe = function(callback, context) {
this.listeners.push([callback, context]);
var key = this.getKey();
var ref = offsetRef(this.ref, key);
var ref = offsetRef(this.ref, key, this.field);
callback.call(context, key && key.val, key && key.key, ref);
};

Expand All @@ -53,7 +53,7 @@ Offset.prototype._notify = function() {
if( !util.isEqual(this.lastNotifyValue, key) ) {
util.log('Offset._notify: key at offset %d is %s', this.curr, key && key.key);
this.lastNotifyValue = key;
var ref = offsetRef(this.ref, key);
var ref = offsetRef(this.ref, key, this.field);
util.each(this.listeners, function(parts) {
parts[0].call(parts[1], key && key.val, key && key.key, ref);
});
Expand All @@ -74,7 +74,7 @@ Offset.prototype._grow = function(callback) {
var oldKey = self.getKey();
var startAt = lastKey(self.keys);
var limit = Math.min(self.curr + (startAt? 2 : 1) - len, self.max);
var ref = startAt !== null? self.ref.startAt(startAt.val, startAt.key) : self.ref;
var ref = startAt !== null? self.ref.startAt(startAt.val, self.field === '$key' ? undefined : startAt.key) : self.ref;
ref.limitToFirst(limit).once('value', function(snap) {
var skipFirst = startAt !== null;
snap.forEach(function(ss) {
Expand Down Expand Up @@ -112,7 +112,7 @@ Offset.prototype._queryRef = function() {
var ref = this.ref;
if( start > 0 ) {
var key = this.getKey(start);
ref = ref.startAt(key.val, key.key);
ref = ref.startAt(key.val, this.field === '$key' ? undefined : key.key);
}
return ref.limitToLast(Math.max(this.curr - start, 1));
};
Expand Down Expand Up @@ -162,7 +162,7 @@ Offset.prototype._monitorEmptyOffset = function() {
}
if( this.keys.length ) {
key = lastKey(this.keys);
ref = ref.startAt(key.val, key.key);
ref = ref.startAt(key.val, this.field === '$key' ? undefined : key.key);
}
util.log.debug('Offset._monitorEmptyOffset: No value exists at offset %d, currently %d keys at this path. Watching for a new value.', this.curr, this.keys.length);
ref.limitToFirst(2).on('value', fn);
Expand Down Expand Up @@ -213,15 +213,15 @@ function extractKey(snap, field) {
return {val: v, key: snap.key()};
}

function offsetRef(baseRef, startKey) {
function offsetRef(baseRef, startKey, field) {
if( startKey === false ) {
return null;
}
else if( startKey === null ) {
return baseRef;
}
else {
return baseRef.startAt(startKey.val, startKey.key);
return baseRef.startAt(startKey.val, field === '$key' ? undefined : startKey.key);
}
}

Expand Down