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

trying to fix redirect to home bug

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-04-04 14:43:47 +02:00
parent 639df7c950
commit 7b11b8b1f0
2 changed files with 12 additions and 10 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
+6 -5
View File
@@ -112,7 +112,7 @@
return ajax_path; return ajax_path;
}; };
function ajaxLoadContent(url, sys_path, ajax_path, selector){ function ajaxLoadContent(url, sys_path, ajax_path, selector){
// console.log('ajaxLoadContent : url', url); console.log('ajaxLoadContent : url', url);
_$body.addClass('ajax-loading'); _$body.addClass('ajax-loading');
var path = window.location.origin + Drupal.url(ajax_path); var path = window.location.origin + Drupal.url(ajax_path);
@@ -253,19 +253,20 @@
window.addEventListener('popstate', onHistoryPopState); window.addEventListener('popstate', onHistoryPopState);
}; };
function initFirstLoad(){ function initFirstLoad(){
// console.log('theme : initFirstLoad()', window.location); console.log('theme : initFirstLoad()', window.location);
// console.log(document.cookie); console.log(document.cookie);
var url = window.location.pathname; var url = window.location.pathname;
var origin_path = getCookie('edlp_origin_path'); var origin_path = getCookie('edlp_origin_path');
// console.log('origin_path', origin_path); console.log('origin_path', origin_path);
if(origin_path){ if(origin_path){
var path_elements = origin_path.split('~~'); var path_elements = origin_path.split('~~');
// console.log(path_elements); console.log(path_elements);
// create history state // create history state
var state = { var state = {
ajax_path: parseAjaxSysPath(path_elements[0]), ajax_path: parseAjaxSysPath(path_elements[0]),
sys_path: path_elements[0], sys_path: path_elements[0],
}; };
console.log('state', state);
// record history state // record history state
history.replaceState(state, null, path_elements[1]); history.replaceState(state, null, path_elements[1]);
// load content through ajax // load content through ajax
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+6 -5
View File
@@ -112,7 +112,7 @@
return ajax_path; return ajax_path;
}; };
function ajaxLoadContent(url, sys_path, ajax_path, selector){ function ajaxLoadContent(url, sys_path, ajax_path, selector){
// console.log('ajaxLoadContent : url', url); console.log('ajaxLoadContent : url', url);
_$body.addClass('ajax-loading'); _$body.addClass('ajax-loading');
var path = window.location.origin + Drupal.url(ajax_path); var path = window.location.origin + Drupal.url(ajax_path);
@@ -253,19 +253,20 @@
window.addEventListener('popstate', onHistoryPopState); window.addEventListener('popstate', onHistoryPopState);
}; };
function initFirstLoad(){ function initFirstLoad(){
// console.log('theme : initFirstLoad()', window.location); console.log('theme : initFirstLoad()', window.location);
// console.log(document.cookie); console.log(document.cookie);
var url = window.location.pathname; var url = window.location.pathname;
var origin_path = getCookie('edlp_origin_path'); var origin_path = getCookie('edlp_origin_path');
// console.log('origin_path', origin_path); console.log('origin_path', origin_path);
if(origin_path){ if(origin_path){
var path_elements = origin_path.split('~~'); var path_elements = origin_path.split('~~');
// console.log(path_elements); console.log(path_elements);
// create history state // create history state
var state = { var state = {
ajax_path: parseAjaxSysPath(path_elements[0]), ajax_path: parseAjaxSysPath(path_elements[0]),
sys_path: path_elements[0], sys_path: path_elements[0],
}; };
console.log('state', state);
// record history state // record history state
history.replaceState(state, null, path_elements[1]); history.replaceState(state, null, path_elements[1]);
// load content through ajax // load content through ajax