Support separate short display for keeping autocomplete box more tidy

horde · Oct 2, 2014 · f65cc7d · f65cc7d
1 parent 8ebd75a
commit f65cc7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/imp/js/autocomplete.js b/imp/js/autocomplete.js
@@ -178,7 +178,7 @@ var IMP_Autocompleter = Class.create({
 
             this.input.up('LI').insert({ before:
                 v.elt
-                    .insert(v.label.truncate(this.p.maxItemSize).escapeHTML())
+                    .insert(v.short_d.truncate(this.p.maxItemSize).escapeHTML())
                     .insert(this.deleteImg().clone(true).show())
                     .store('itemid', v.id)
             });
@@ -354,7 +354,7 @@ var IMP_Autocompleter = Class.create({
         }
 
         r.each(function(e) {
-            obs.push(new IMP_Autocompleter_Elt(e.v, e.l));
+            obs.push(new IMP_Autocompleter_Elt(e.v, e.l, e.s));
         });
 
         obs = this.filterChoices(obs);
@@ -404,12 +404,14 @@ IMP_Autocompleter_Elt = Class.create({
     // elt,
     // id,
     // label,
+    // short_d,
     // value,
 
-    initialize: function(value, label)
+    initialize: function(value, label, short_d)
     {
         this.value = value;
         this.label = label || value;
+        this.short_d = short_d || value;
     }
 
 });
diff --git a/imp/lib/Ajax/Application/Handler/Dynamic.php b/imp/lib/Ajax/Application/Handler/Dynamic.php
@@ -1278,7 +1278,10 @@ public function mailboxSize()
      *   - type: (string) Autocomplete search type.
      *
      * @return object  An object with the following properties:
-     *   - results: (array)
+     *   - results: (array) Array with the following keys for each result:
+     *     - l: (string) Full label.
+     *     - s: (string) Short display string.
+     *     - v: (string) Value.
      */
     public function autocompleteSearch()
     {
@@ -1293,11 +1296,18 @@ public function autocompleteSearch()
             );
 
             foreach ($addr as $val) {
-                $l = $val->writeAddress(array('noquote' => true));
                 $tmp = array('v' => strval($val));
+
+                $l = $val->writeAddress(array('noquote' => true));
                 if ($l !== $tmp['v']) {
                     $tmp['l'] = $l;
                 }
+
+                $s = $val->label;
+                if ($s !== $tmp['v']) {
+                    $tmp['s'] = $s;
+                }
+
                 $out->results[] = $tmp;
             }
             break;