diff --git a/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js b/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js index 8d80b3a74..e8f6cb2f9 100644 --- a/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js +++ b/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js @@ -59,7 +59,9 @@ var _$articles_link; var _node_pop_up; // Colors depend on drupalSettings loaded by edlp_corpus.module - var _ecolors = drupalSettings.edlp_corpus.colors; + var _settings = drupalSettings.edlp_corpus; + // load_corpus_ajax_url + var _ecolors = _settings.colors; //console.log('Corpus : _ecolors', _ecolors); // Physics var _attracter, @@ -114,7 +116,9 @@ function loadCorpus(){ // console.log('drupalSettings',drupalSettings); // console.log('window.location', window.location); - var path = window.location.origin + drupalSettings.basepath + "edlp/corpus"; + // var path = window.location.origin + drupalSettings.basepath + "edlp/corpus"; + var ajax_path = _settings.load_corpus_ajax_url; + var path = window.location.origin + Drupal.url(ajax_path); $.getJSON(path, {}) .done(function(data){ onCorpusLoaded(data); diff --git a/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js b/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js index 8d80b3a74..e8f6cb2f9 100644 --- a/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js +++ b/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js @@ -59,7 +59,9 @@ var _$articles_link; var _node_pop_up; // Colors depend on drupalSettings loaded by edlp_corpus.module - var _ecolors = drupalSettings.edlp_corpus.colors; + var _settings = drupalSettings.edlp_corpus; + // load_corpus_ajax_url + var _ecolors = _settings.colors; //console.log('Corpus : _ecolors', _ecolors); // Physics var _attracter, @@ -114,7 +116,9 @@ function loadCorpus(){ // console.log('drupalSettings',drupalSettings); // console.log('window.location', window.location); - var path = window.location.origin + drupalSettings.basepath + "edlp/corpus"; + // var path = window.location.origin + drupalSettings.basepath + "edlp/corpus"; + var ajax_path = _settings.load_corpus_ajax_url; + var path = window.location.origin + Drupal.url(ajax_path); $.getJSON(path, {}) .done(function(data){ onCorpusLoaded(data); diff --git a/sites/all/modules/figli/edlp_corpus/edlp_corpus.module b/sites/all/modules/figli/edlp_corpus/edlp_corpus.module index 77adb1077..574d0b32b 100644 --- a/sites/all/modules/figli/edlp_corpus/edlp_corpus.module +++ b/sites/all/modules/figli/edlp_corpus/edlp_corpus.module @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; +use Drupal\Core\Url; /** * Implements hook_theme(). @@ -137,6 +138,9 @@ function edlp_corpus_page_attachments(array &$attachments) { $attachments['#attached']['drupalSettings']['edlp_corpus']['colors'] = $js_list; + // load corpus + $url = Url::fromRoute('edlp_corpus.corpusjson'); + $attachments['#attached']['drupalSettings']['edlp_corpus']['load_corpus_ajax_url'] = $url->getInternalPath(); } diff --git a/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml b/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml index 5283ad103..006f9cc1e 100644 --- a/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml +++ b/sites/all/modules/figli/edlp_search/edlp_search.libraries.yml @@ -1,6 +1,6 @@ edlp_search-library: js: - assets/scripts/edlp_search.js: { scope: footer } + assets/dist/scripts/edlp_search.min.js: { scope: footer } dependencies: - core/drupalSettings - core/jquery diff --git a/sites/all/modules/figli/edlp_studio/edlp_studio.libraries.yml b/sites/all/modules/figli/edlp_studio/edlp_studio.libraries.yml index 489907f4e..6318c478f 100644 --- a/sites/all/modules/figli/edlp_studio/edlp_studio.libraries.yml +++ b/sites/all/modules/figli/edlp_studio/edlp_studio.libraries.yml @@ -1,6 +1,6 @@ edlp_studio-library: js: - assets/scripts/edlp_studio.js: { scope: footer } + assets/dist/scripts/edlp_studio.min.js: { scope: footer } dependencies: - core/drupalSettings - core/jquery