From 7118c2163467a9592125a98c90294653bebe1282 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 22 Oct 2009 21:48:08 -0600
Subject: [PATCH] Tweak viewport config settings.

limit_factor isn't worth having a config option - the default option
should be fine for all cases.

Now that the server side code has become faster, increase performance
parameters for viewport listing.
---
 imp/config/conf.xml                    | 8 ++------
 imp/docs/UPGRADING                     | 2 ++
 imp/js/DimpBase.js                     | 1 -
 imp/js/ViewPort.js                     | 2 +-
 imp/templates/javascript_defs_dimp.php | 1 -
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/imp/config/conf.xml b/imp/config/conf.xml
index 6f6987934..0b2fb66eb 100644
--- a/imp/config/conf.xml
+++ b/imp/config/conf.xml
@@ -262,14 +262,10 @@
    <configsection name="viewport">
     <configinteger name="buffer_pages" desc="The number of viewable pages to
     send to the browser per server access when listing
-    messages.">8</configinteger>
-    <configinteger name="limit_factor" desc="When browsing through a message
-    list, if a user comes within this percentage of the end of the current
-    cached viewport, the browser will send a background request to the server
-    to retrieve the next slice of the message list.">35</configinteger>
+    messages.">10</configinteger>
     <configinteger name="viewport_wait" desc="How long, in seconds, to wait
     before displaying an informational message to users that the message list is
-    still being built. Set to 0 to disable messages.">12</configinteger>
+    still being built. Set to 0 to disable messages.">10</configinteger>
    </configsection>
   </configsection>
  </configtab>
diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
index f87673c6a..88c3e83bf 100644
--- a/imp/docs/UPGRADING
+++ b/imp/docs/UPGRADING
@@ -43,6 +43,8 @@ The 'max_from_chars' and 'max_subj_chars' configuration options for the
 minimal (mimp) display have been moved to preferences ('mimp_max_from_chars'
 and 'mimp_max_subj_chars').
 
+The 'limit_factor' configuration option has been removed.
+
 
 Preferences
 -----------
diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index 5284fea9d..aad85f274 100644
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -406,7 +406,6 @@ var DimpBase = {
             buffer_pages: DIMP.conf.buffer_pages,
             content_class: 'msglist',
             empty_msg: DIMP.text.vp_empty,
-            limit_factor: DIMP.conf.limit_factor,
             page_size: DIMP.conf.splitbar_pos,
             show_split_pane: DIMP.conf.preview_pref,
             split_bar: 'splitBar',
diff --git a/imp/js/ViewPort.js b/imp/js/ViewPort.js
index 8bb58f772..1d4edd647 100644
--- a/imp/js/ViewPort.js
+++ b/imp/js/ViewPort.js
@@ -118,7 +118,7 @@ var ViewPort = Class.create({
     initialize: function(opts)
     {
         this.opts = Object.extend({
-            buffer_pages: 5,
+            buffer_pages: 10,
             limit_factor: 35,
             lookbehind: 40
         }, opts);
diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php
index 769ca6842..9716151d8 100644
--- a/imp/templates/javascript_defs_dimp.php
+++ b/imp/templates/javascript_defs_dimp.php
@@ -68,7 +68,6 @@ $code['conf'] = array_filter(array(
     'flags' => $flags,
     'fsearchid' => IMP_Search::MBOX_PREFIX . IMP_Search::DIMP_FILTERSEARCH,
     'ham_spammbox' => intval(!empty($GLOBALS['conf']['notspam']['spamfolder'])),
-    'limit_factor' => intval($GLOBALS['conf']['dimp']['viewport']['limit_factor']),
     'login_view' => $GLOBALS['prefs']->getValue('dimp_login_view'),
     'name' => $GLOBALS['registry']->get('name', 'imp'),
     'popup_height' => 610,
-- 
2.11.0