Autocompleter is now handled via regular AJAX calls, and wholly withi…

…n IMP

There are several improvements coming to IMP autocompleter, which is
going to require object return to the browser (currently, we return
e-mail strings). No need to touch the Horde code.

Basic view autocomplete no longer will work in git master.

Also, Imples need to die in general.

imp/js/compose-base.js

@@ -9,6 +9,7 @@
 var ImpComposeBase = {
 
     // Vars defaulting to null: editor_on, identities, rte_sig
+    ac: $H(),
 
     getSpellChecker: function()
     {
@@ -160,16 +161,9 @@ var ImpComposeBase = {
         return val;
     },
 
-    autocompleteHandlers: function()
-    {
-        var handlers = {};
-        $(document).fire('AutoComplete:handlers', handlers);
-        return $H(handlers);
-    },
-
     autocompleteProcess: function(r)
     {
-        this.autocompleteHandlers().each(function(pair) {
+        this.ac.each(function(pair) {
             var ob = $H(pair.value.toObject(true));
             ob.values().each(function(v) {
                 v.className = pair.value.p.listClassItem;
@@ -189,7 +183,7 @@ var ImpComposeBase = {
         params = $H(params);
 
         if (ac) {
-            this.autocompleteHandlers().each(function(pair) {
+            this.ac.each(function(pair) {
                 $H(pair.value.toObject()).each(function(pair2) {
                     out.push({
                         addr: pair2.value,

imp/js/compose-dimp.js

@@ -1378,6 +1378,26 @@ var DimpCompose = {
 
     onDomLoad: function()
     {
+        /* Initialize autocompleters. */
+        $('to', 'cc', 'bcc', 'redirect_to').compact().each(function(a) {
+            ImpComposeBase.ac.set(
+                a.identify(),
+                new IMP_PrettyAutocompleter(a.identify(), {
+                    boxClass: 'hordeACBox impACBox',
+                    boxClassFocus: 'impACBoxFocus',
+                    deleteIcon: DimpCore.conf.ac_delete,
+                    displayFilter: function(t) { return t.sub(/<[^>]*>$/, "").strip().escapeHTML(); },
+                    growingInputClass: 'hordeACTrigger impACTrigger',
+                    listClass: 'hordeACList impACList',
+                    minChars: DimpCore.conf.ac_minchars,
+                    processValueCallback: ImpComposeBase.autocompleteValue.bind(ImpComposeBase),
+                    removeClass: 'hordeACItemRemove impACItemRemove',
+                    trigger: a.identify(),
+                    triggerContainer: Math.random().toString()
+                })
+            );
+        });
+
         /* Initialize redirect elements. */
         if (DimpCore.conf.redirect) {
             $('redirect').observe('submit', Event.stop);

imp/js/prettyautocomplete.js

@@ -4,7 +4,6 @@
  *
  * Events handled by this class:
  *   - AutoComplete:focus
- *   - AutoComplete:handlers
  *   - AutoComplete:reset
  *   - AutoComplete:update
  *
@@ -40,7 +39,7 @@ var IMP_PrettyAutocompleter = Class.create({
             listClassItem: 'hordeACListItem',
             // input (created below)
             // CSS class for real input field
-            growingInputClass: 'hordeACTrigger impACTrigger',
+            growingInputClass: 'hordeACTrigger',
             removeClass: 'hordeACItemRemove',
             // Allow for a function that filters the display value
             // This function should *always* return escaped HTML
@@ -94,14 +93,11 @@ var IMP_PrettyAutocompleter = Class.create({
         new PeriodicalExecuter(this.inputWatcher.bind(this), 0.25);
 
         p_clone = $H(this.p).toObject();
+        p_clone.input = this.input;
         p_clone.onSelect = this.updateElement.bind(this);
-        p_clone.paramName = this.elt.readAttribute('name');
         p_clone.tokens = [];
 
-        ac = new Ajax.Autocompleter(this.input, this.p.uri, p_clone);
-        ac.getToken = function() {
-            return $F(this.input);
-        }.bind(this);
+        ac = new Ajax.IMP_Autocompleter(this.input, p_clone);
 
         this.reset();
 
@@ -111,9 +107,6 @@ var IMP_PrettyAutocompleter = Class.create({
                 e.stop();
             }
         }.bindAsEventListener(this));
-        document.observe('AutoComplete:handlers', function(e) {
-            e.memo[this.elt.identify()] = this;
-        }.bind(this));
         document.observe('AutoComplete:reset', this.reset.bind(this));
         document.observe('AutoComplete:update', this.processInput.bind(this));
     },
@@ -341,3 +334,38 @@ var IMP_PrettyAutocompleter = Class.create({
     }
 
 });
+
+Ajax.IMP_Autocompleter = Class.create(Autocompleter.Base, {
+
+    initialize: function(element, opts)
+    {
+        this.baseInitialize(element, opts);
+        this.cache = $H();
+    },
+
+    getToken: function()
+    {
+        return $F(this.opts.input);
+    },
+
+    getUpdatedChoices: function(t)
+    {
+        var c = this.cache.get(t);
+
+        if (c) {
+            this.updateChoices(c);
+        } else {
+            DimpCore.doAction('autocompleteSearch', {
+                search: t
+            }, {
+                callback: this._onComplete.bind(this)
+            });
+        }
+    },
+
+    _onComplete: function(request)
+    {
+        this.updateChoices(this.cache.set(this.getToken(), request));
+    }
+
+});

imp/lib/Ajax/Application/Handler/Dynamic.php

@@ -1285,4 +1285,18 @@ public function mailboxSize()
         return $ret;
     }
 
+    /**
+     * TODO
+     */
+    public function autocompleteSearch()
+    {
+        return array_map(
+            'strval',
+            $GLOBALS['injector']->getInstance('IMP_Contacts')->searchEmail(
+                $this->vars->search,
+                array('levenshtein' => true)
+            )->base_addresses
+        );
+    }
+
 }

imp/lib/Ajax/Application/Handler/Smartmobile.php

@@ -54,8 +54,13 @@ public function __construct(Horde_Core_Ajax_Application $base)
      */
     public function smartmobileAutocomplete()
     {
-        $imple = new IMP_Ajax_Imple_ContactAutoCompleter();
-        return array_map('htmlspecialchars', $imple->getAddressList($this->vars->search)->base_addresses);
+        return array_map(
+            'htmlspecialchars',
+            $GLOBALS['injector']->getInstance('IMP_Contacts')->searchEmail(
+                $this->vars->search,
+                array('levenshtein' => true)
+            )->base_addresses
+        );
     }
 
     /**

imp/lib/Basic/Compose.php

@@ -616,11 +616,8 @@ protected function _init()
         /* Get the message cache ID. */
         $composeCacheID = filter_var($imp_compose->getCacheId(), FILTER_SANITIZE_STRING);
 
-        /* Attach autocompleters to the compose form elements. */
-        if ($redirect) {
-            $imp_ui->attachAutoCompleter(array('to'));
-        } else {
-            $imp_ui->attachAutoCompleter(array('to', 'cc', 'bcc'));
+        $page_output->addScriptPackage('IMP_Script_Package_ContactAutocomplete');
+        if (!$redirect) {
             $spellcheck = $imp_ui->attachSpellChecker();
             $page_output->addScriptFile('ieescguard.js', 'horde');
         }

imp/lib/Compose/Ui.php

@@ -29,26 +29,6 @@ class IMP_Compose_Ui
      */
     protected $_spellInit = false;
 
-    /**
-     * Attach the auto-completer to the current compose form.
-     *
-     * @param array $fields  The list of DOM IDs to attach the autocompleter
-     *                       to.
-     */
-    public function attachAutoCompleter($fields)
-    {
-        /* Attach autocompleters to the compose form elements. */
-        if ($GLOBALS['registry']->hasMethod('contacts/search')) {
-            foreach ($fields as $val) {
-                $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')
-                    ->create(
-                        'IMP_Ajax_Imple_ContactAutoCompleter',
-                        array('id' => $val)
-                    );
-            }
-        }
-    }
-
     /**
      * Attach the spellchecker to the current compose form.
      *