Fix quicksearch ID generation.

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 10006d8..39c6701 100644 (file)
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -18,8 +18,6 @@ var DimpBase = {
     pivotrow: -1,
     ppcache: {},
     ppfifo: [],
-    // Null character in mailbox name indicates search mailbox.
-    qsearchid: 'dimp\x00qsearch',
     tcache: {},
 
     // Preview pane cache size is 20 entries. Given that a reasonable guess
@@ -1262,7 +1260,7 @@ var DimpBase = {
     /* Search functions. */
     isSearch: function(id)
     {
-        return (id ? id : this.folder) == this.qsearchid;
+        return (id ? id : this.folder) == DIMP.conf.qsearchid;
     },
 
     _quicksearchOnBlur: function()
@@ -1280,7 +1278,7 @@ var DimpBase = {
         } else {
             this.sfolder = this.folder;
             $('qsearch_close').show();
-            this.loadMailbox(this.qsearchid);
+            this.loadMailbox(DIMP.conf.qsearchid);
         }
     },
 
@@ -1296,7 +1294,7 @@ var DimpBase = {
             if (!noload) {
                 this.loadMailbox(this.sfolder);
             }
-            this.viewport.deleteView(this.qsearchid);
+            this.viewport.deleteView(DIMP.conf.qsearchid);
         }
     },
 

diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php
index 2e0ff86..9d659f7 100644 (file)
--- a/imp/templates/javascript_defs_dimp.php
+++ b/imp/templates/javascript_defs_dimp.php
@@ -72,6 +72,7 @@ $code['conf'] = array_filter(array(
     'popup_height' => 610,
     'popup_width' => 820,
     'preview_pref' => intval($GLOBALS['prefs']->getValue('dimp_show_preview')),
+    'qsearchid' => IMP_Search::MBOX_PREFIX . 'dimpqsearch',
     'refresh_time' => intval($GLOBALS['prefs']->getValue('refresh_time')),
     'sortdate' => Horde_Imap_Client::SORT_DATE,
     'sortthread' => Horde_Imap_Client::SORT_THREAD,