Handling direct link, instead of search and then go to the suggestion.

Author: nignatov

modules/elasticsearch_connector_search_api/js/elasticsearch_connector_search_api_autocomplete.js

@@ -1,22 +1,50 @@
 (function ($) {
-/**
+
+  /**
+   * Hides the autocomplete suggestions, original function.
+   */
+  Drupal.jsAC.prototype.hidePopupOrig = function (keycode) {
+    // Select item if the right key or mousebutton was pressed.
+    if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
+      this.input.value = $(this.selected).data('autocompleteValue');
+    }
+    // Hide popup.
+    var popup = this.popup;
+    if (popup) {
+      this.popup = null;
+      $(popup).fadeOut('fast', function () { $(popup).remove(); });
+    }
+    this.selected = false;
+    $(this.ariaLive).empty();
+  };
+
+  /**
  * Hides the autocomplete suggestions.
  */
-Drupal.jsAC.prototype.hidePopup = function (keycode) {
-  // Select item if the right key or mousebutton was pressed.
-  if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
-    this.input.value = $('a', this.selected).attr("href");
-    return $('a', this.selected).attr("href");
-  }
+Drupal.jsAC.prototype.hidePopup = function (keycode, event) {
+  if ($(this.input).attr('elasticsearch-autocomplete')) {
+    // Select item if the right key or mousebutton was pressed.
+    if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
+      this.input.value = $('a', this.selected).text();
+      if (typeof event != 'undefined') {
+        event.preventDefault();
+      }
+
+      window.location = $('a', this.selected).attr("href");
+    }
 
-  // Hide popup.
-  var popup = this.popup;
-  if (popup) {
-    this.popup = null;
-    $(popup).fadeOut('fast', function () { $(popup).remove(); });
+    // Hide popup.
+    var popup = this.popup;
+    if (popup) {
+      this.popup = null;
+      $(popup).fadeOut('fast', function () { $(popup).remove(); });
+    }
+    this.selected = false;
+    $(this.ariaLive).empty();
+  }
+  else {
+    this.hidePopupOrig(keycode);
   }
-  this.selected = false;
-  $(this.ariaLive).empty();
 };
 
 /**
@@ -33,6 +61,7 @@ Drupal.behaviors.elasticsearch_autocomplete = {
       }
       var $input = $(this)
         .attr('autocomplete', 'OFF')
+        .attr('elasticsearch-autocomplete', true)
         .attr('aria-autocomplete', 'list');
       $($input[0].form).unbind();
       $($input[0].form).submit(Drupal.ELAutocompleteSubmit);
@@ -52,20 +81,13 @@ Drupal.behaviors.elasticsearch_autocomplete = {
  * Prevents the form from submitting if the suggestions popup is open
  * and closes the suggestions popup when doing so.
  */
-Drupal.ELAutocompleteSubmit = function () {
+Drupal.ELAutocompleteSubmit = function (e) {
   var href = '';
   $('#autocomplete').each(function () {
-    href = this.owner.hidePopup();
+    this.owner.hidePopup(null, e);
   });
 
-  if (href == '' || typeof href == 'undefined') {
-    return false;;
-  }
-  else {
-    window.location = href;
-  }
-
-  return false;
+  return true;
 };
 })(jQuery);
 

modules/elasticsearch_connector_search_api/service.inc

@@ -1779,18 +1779,19 @@ class SearchApiElasticsearchConnector extends SearchApiAbstractService {
     if (isset($response['results'])) {
       $items = $index->loadItems(array_keys($response['results']));
       foreach ($items as $id => $item) {
-        $node_title = $index->datasource()->getItemLabel($item);
+        $item_title = $index->datasource()->getItemLabel($item);
+        $url_item = $index->datasource()->getItemUrl($item);
         if (!empty($search->options['custom']['link_suggestions'])) {
-          $matches[$node_title] = l($node_title, 'node/' . $item->nid);
+          $matches[$item_title] = l($item_title, $url_item['path'], array('html' => TRUE));
         }
         else {
-          $matches[$node_title] = $node_title;
+          $matches[$item_title] = $item_title;
         }
       }
 
       if ($matches) {
         // Eliminate suggestions that are too short or already in the query.
-        foreach ($matches as $name => $node_title) {
+        foreach ($matches as $name => $item_title) {
           if (drupal_strlen($name) < 3 || isset($keys_array[$name])) {
             unset($matches[$name]);
           }