From 5e89c1236d475c29f43996eabdee22b64ade5cfa Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 19 Oct 2012 04:37:36 -0400
Subject: [PATCH] Merged the code of _getData into getData and getting rid of
 the delay for rows that are already in cache

---
 UI/WebServerResources/SOGoMailDataSource.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/UI/WebServerResources/SOGoMailDataSource.js b/UI/WebServerResources/SOGoMailDataSource.js
index 70d686756..c587b2982 100644
--- a/UI/WebServerResources/SOGoMailDataSource.js
+++ b/UI/WebServerResources/SOGoMailDataSource.js
@@ -116,19 +116,8 @@ SOGoMailDataSource = Class.create({
                 this.delayedGetData = this.getData.bind(this, id, index, count, callbackFunction, delay);
                 return;
             }
-            if (this.delayed_getData) window.clearTimeout(this.delayed_getData);
-            this.delayed_getData = this._getData.bind(this,
-                                                      id,
-                                                      index,
-                                                      count,
-                                                      callbackFunction
-                                                      ).delay(delay);
-        },
 
-        _getData: function(id, index, count, callbackFunction) {
             var start, end;
-            var i, j;
-            var missingUids = new Array();
 
             if (count > 1) {
                 // Compute last index depending on number of UIDs
@@ -149,12 +138,12 @@ SOGoMailDataSource = Class.create({
             }
 //            log ("MailDataSource._getData() from " + index + " to " + (index + count) + " boosted from " + start + " to " + end);
 
-            for (i = 0, j = start; j < end; j++) {
+            var missingUids = [];
+            for (var j = start; j < end; j++) {
                 var uid = this.threaded? this.uids[j][0] : this.uids[j];
                 if (!this.cache.get(uid)) {
 //                    log ("MailDataSource._getData missing headers of uid " + uid + " at index " + j + (this.threaded? " (":" (non-") + "threaded)");
-                    missingUids[i] = uid;
-                    i++;
+                    missingUids.push(uid);
                 }
             }
 
@@ -165,7 +154,7 @@ SOGoMailDataSource = Class.create({
                                                                       { callbackFunction: callbackFunction,
                                                                         start: start, end: end,
                                                                         id: id },
-                                                                      params).delay(0.5);
+                                                                      params).delay(delay);
             }
             else if (callbackFunction)
                 this._returnData(callbackFunction, id, start, end);