From 3b3cd5562c1faa20a47bc799bfe28c0c02905e60 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 15 Jun 2009 05:02:43 -0600 Subject: [PATCH] Fix some updating issues after non-requested data is returned by server --- imp/js/src/ViewPort.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/imp/js/src/ViewPort.js b/imp/js/src/ViewPort.js index 665397b36..381176d9e 100644 --- a/imp/js/src/ViewPort.js +++ b/imp/js/src/ViewPort.js @@ -638,19 +638,22 @@ var ViewPort = Class.create({ this.opts.onCacheUpdate(r.view); } - if (r.request_id == this.active_req) { + if (r.request_id && + r.request_id == this.active_req) { this.active_req = null; offset = buffer.getMetaData('req_offset'); buffer.setMetaData({ req_offset: undefined }); - // TODO: Flag for no _fetchBuffer()? - this._updateContent(Object.isUndefined(offset) ? (r.rownum ? Number(r.rownum) - 1 : this.currentOffset()) : offset); - if (this.opts.onEndFetch) { this.opts.onEndFetch(); } } + // TODO: Flag for no _fetchBuffer()? + if (this.view == r.view) { + this._updateContent(Object.isUndefined(offset) ? (r.rownum ? Number(r.rownum) - 1 : this.currentOffset()) : offset); + } + this.isbusy = false; }, -- 2.11.0