From 973483a6eb49ab0aabf894fb882225d34ccd4773 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 19 Mar 2018 00:20:14 +0100 Subject: [PATCH] added js library to edlp_search --- .../figli/edlp_search/assets/js/edlp_search.js | 10 ++++++++++ .../figli/edlp_search/edlp_search.libraries.yml | 6 ++++++ .../all/modules/figli/edlp_search/edlp_search.module | 12 ++++++++++++ .../src/Controller/EdlpSearchController.php | 9 ++++++--- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 sites/all/modules/figli/edlp_search/assets/js/edlp_search.js create mode 100644 sites/all/modules/figli/edlp_search/edlp_search.libraries.yml diff --git a/sites/all/modules/figli/edlp_search/assets/js/edlp_search.js b/sites/all/modules/figli/edlp_search/assets/js/edlp_search.js new file mode 100644 index 000000000..0ec258349 --- /dev/null +++ b/sites/all/modules/figli/edlp_search/assets/js/edlp_search.js @@ -0,0 +1,10 @@ +(function ($, Drupal, drupalSettings) { + + var settings = drupalSettings.edlp_studio; + + function init(){ + console.log('Edlp Search Init'); + }; + + init(); +})(jQuery, Drupal, drupalSettings); diff --git a/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml b/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml new file mode 100644 index 000000000..cd72ddc6c --- /dev/null +++ b/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml @@ -0,0 +1,6 @@ +edlp_search-library: + js: + assets/js/edlp_search.js: { scope: footer } + dependencies: + - core/drupalSettings + - core/jquery diff --git a/sites/all/modules/figli/edlp_search/edlp_search.module b/sites/all/modules/figli/edlp_search/edlp_search.module index e0058d59c..5b1325b03 100644 --- a/sites/all/modules/figli/edlp_search/edlp_search.module +++ b/sites/all/modules/figli/edlp_search/edlp_search.module @@ -6,6 +6,7 @@ */ use Drupal\Core\Routing\RouteMatchInterface; +use Drupal\Core\Url; /** * Implements hook_help(). @@ -23,6 +24,17 @@ function edlp_search_help($route_name, RouteMatchInterface $route_match) { } } +/** + * Implements hook_page_attachments(). + * @param array $attachments + */ +function edlp_search_page_attachments(array &$attachments) { + $attachments['#attached']['library'][] = 'edlp_search/edlp_search-library'; + $url = Url::fromRoute('edlp_search.edlp_search_controller_searchResults_ajax', [], ['absolute' => TRUE]); + $attachments['#attached']['drupalSettings']['edlp_search']['results_ajax_url'] = $url->getInternalPath(); +} + + /** * Implements hook_theme(). */ diff --git a/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php b/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php index e6ada123b..3f60727c4 100644 --- a/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php +++ b/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php @@ -5,8 +5,7 @@ namespace Drupal\edlp_search\Controller; use Drupal\Core\Controller\ControllerBase; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Entity\EntityStorageInterface; -// use Drupal\facets\FacetManager\DefaultFacetManager; -// use Drupal\search_api_page\Entity\SearchApiPage; +use Symfony\Component\HttpFoundation\Request; use Drupal\Core\Form\FormBuilder; use Symfony\Component\HttpFoundation\JsonResponse; @@ -88,10 +87,14 @@ class EdlpSearchController extends ControllerBase { '#markup' => $this->t('Implement method: searchResults') ]; } - public function searchResultsJson(){ + public function searchResultsJson(Request $request){ + + $keys = $request->query->get('keys'); + $response = new JsonResponse(); $response->setData([ 'test'=>'search results', + 'keys'=>$keys // 'rendered'=> $rendered, ]); return $response;