Browse Source

trying to fix redirect to home bug

Bachir Soussi Chiadmi 6 năm trước cách đây
mục cha
commit
7b11b8b1f0

+ 6 - 5
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js

@@ -112,7 +112,7 @@
       return ajax_path;
     };
     function ajaxLoadContent(url, sys_path, ajax_path, selector){
-      // console.log('ajaxLoadContent : url', url);
+      console.log('ajaxLoadContent : url', url);
       _$body.addClass('ajax-loading');
 
       var path = window.location.origin + Drupal.url(ajax_path);
@@ -253,19 +253,20 @@
       window.addEventListener('popstate', onHistoryPopState);
     };
     function initFirstLoad(){
-      // console.log('theme : initFirstLoad()', window.location);
-      // console.log(document.cookie);
+      console.log('theme : initFirstLoad()', window.location);
+      console.log(document.cookie);
       var url = window.location.pathname;
       var origin_path = getCookie('edlp_origin_path');
-      // console.log('origin_path', origin_path);
+      console.log('origin_path', origin_path);
       if(origin_path){
         var path_elements = origin_path.split('~~');
-        // console.log(path_elements);
+        console.log(path_elements);
         // create history state
         var state = {
           ajax_path: parseAjaxSysPath(path_elements[0]),
           sys_path: path_elements[0],
         };
+        console.log('state', state);
         // record history state
         history.replaceState(state, null, path_elements[1]);
         // load content through ajax

+ 6 - 5
sites/all/themes/custom/edlptheme/assets/scripts/main.js

@@ -112,7 +112,7 @@
       return ajax_path;
     };
     function ajaxLoadContent(url, sys_path, ajax_path, selector){
-      // console.log('ajaxLoadContent : url', url);
+      console.log('ajaxLoadContent : url', url);
       _$body.addClass('ajax-loading');
 
       var path = window.location.origin + Drupal.url(ajax_path);
@@ -253,19 +253,20 @@
       window.addEventListener('popstate', onHistoryPopState);
     };
     function initFirstLoad(){
-      // console.log('theme : initFirstLoad()', window.location);
-      // console.log(document.cookie);
+      console.log('theme : initFirstLoad()', window.location);
+      console.log(document.cookie);
       var url = window.location.pathname;
       var origin_path = getCookie('edlp_origin_path');
-      // console.log('origin_path', origin_path);
+      console.log('origin_path', origin_path);
       if(origin_path){
         var path_elements = origin_path.split('~~');
-        // console.log(path_elements);
+        console.log(path_elements);
         // create history state
         var state = {
           ajax_path: parseAjaxSysPath(path_elements[0]),
           sys_path: path_elements[0],
         };
+        console.log('state', state);
         // record history state
         history.replaceState(state, null, path_elements[1]);
         // load content through ajax