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

production controller retrie production menu links list, fixed js drupalSettings bug

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-01 17:58:52 +01:00
parent 432fb2367f
commit 44eb8476ac
7 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+8 -3
View File
@@ -88,8 +88,7 @@ edlp_vars = {
return false;
}
// TODO: drupal settings not defined on NOT front page
var path = window.location.origin + drupalSettings.basepath + sys_path +'/ajax';
var path = window.location.origin + drupalSettings.path.baseUrl + sys_path +'/ajax';
closeAllModals();
_$body.addClass('ajax-loading');
$link.addClass('ajax-loading');
@@ -104,7 +103,13 @@ edlp_vars = {
console.log('ajax link loaded : data', data);
_$content_container.html(data.rendered);
_$body.removeClass('ajax-loading');
_$body.removeClass().addClass('path-'+sys_path);
// add body class for currently loaded content
_$body.removeClass().addClass('path-'+sys_path.replace(/\//g, '-'));
// id node add a generic path-node class to body
m = sys_path.match(/^\/?(edlp\/node\/\d+)$/g);
if(m){
_$body.addClass('path-edlp-node');
}
_$ajaxLinks.removeClass('is-active');
$link.removeClass('ajax-loading').addClass('is-active');
initScrollbars();
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+8 -3
View File
@@ -65,8 +65,7 @@
return false;
}
// TODO: drupal settings not defined on NOT front page
var path = window.location.origin + drupalSettings.basepath + sys_path +'/ajax';
var path = window.location.origin + drupalSettings.path.baseUrl + sys_path +'/ajax';
closeAllModals();
_$body.addClass('ajax-loading');
$link.addClass('ajax-loading');
@@ -81,7 +80,13 @@
console.log('ajax link loaded : data', data);
_$content_container.html(data.rendered);
_$body.removeClass('ajax-loading');
_$body.removeClass().addClass('path-'+sys_path);
// add body class for currently loaded content
_$body.removeClass().addClass('path-'+sys_path.replace(/\//g, '-'));
// id node add a generic path-node class to body
m = sys_path.match(/^\/?(edlp\/node\/\d+)$/g);
if(m){
_$body.addClass('path-edlp-node');
}
_$ajaxLinks.removeClass('is-active');
$link.removeClass('ajax-loading').addClass('is-active');
initScrollbars();
sites/all/themes/custom/edlptheme/edlptheme.libraries.yml
+1
View File
@@ -14,6 +14,7 @@ global-js:
assets/dist/bower/jquery.overlayScrollbars.min.js: { scope: footer }
assets/dist/scripts/main.min.js: { scope: footer }
dependencies:
- core/drupal
- core/matchmedia
- core/matchmedia.addListener
- core/jquery