bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-04-04 13:13:44 +02:00
parent 6263b674b8
commit b5812b2198
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js
Vendored
+6 -2
View File
@@ -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);
sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js
+6 -2
View File
@@ -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);
sites/all/modules/figli/edlp_corpus/edlp_corpus.module
+4
View File
@@ -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();
}
sites/all/modules/figli/edlp_search/edlp_search.libraries.yml
+1 -1
View File
@@ -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
sites/all/modules/figli/edlp_studio/edlp_studio.libraries.yml
+1 -1
View File
@@ -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