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

definitly fix the history bug due to aggregation by loading history in head

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-04-04 16:08:22 +02:00
parent 52f5a24742
commit cf1ea6aea7
6 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/themes/custom/edlptheme/assets/dist/scripts/history.min.js
Vendored
+1 -14
View File
@@ -1,24 +1,11 @@
console.log('history'); console.log('EDLP THEME HISTORY.js');
// https://plainjs.com/javascript/utilities/set-cookie-get-cookie-and-delete-cookie-5/
// function setCookie(name, value, days) {
// var d = new Date;
// d.setTime(d.getTime() + 24*60*60*1000*days);
// document.cookie = name + "=" + value + ";path=/;expires=" + d.toGMTString();
// }
// var edlp is provided by edlp_ajax.module file // var edlp is provided by edlp_ajax.module file
if(edlp.redirect){ if(edlp.redirect){
console.log('history redirect'); console.log('history redirect');
document.body.style.visibility = 'hidden';
// record current (will be origin) sys_path in cookie
// var cookiename = "edlp_origin_path";
// var cookie_value = edlp.sys_path.replace(/^\//, '') + '~~' + window.location.pathname;
// setCookie(cookiename, cookie_value, 1);
window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, '')); window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
window.localStorage.setItem('edlp_origin_url', window.location.pathname); window.localStorage.setItem('edlp_origin_url', window.location.pathname);
// redirect to home // redirect to home
window.location.replace(window.location.origin); window.location.replace(window.location.origin);
}else{ }else{
console.log('history do not redirect'); console.log('history do not redirect');
document.body.style.visibility = 'visible';
} }
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+1
View File
@@ -1,3 +1,4 @@
console.log('EDLP THEME MAIN.js');
(function($, Drupal, drupalSettings) { (function($, Drupal, drupalSettings) {
EdlpTheme = function(){ EdlpTheme = function(){
sites/all/themes/custom/edlptheme/assets/scripts/history.js
+1 -14
View File
@@ -1,24 +1,11 @@
console.log('history'); console.log('EDLP THEME HISTORY.js');
// https://plainjs.com/javascript/utilities/set-cookie-get-cookie-and-delete-cookie-5/
// function setCookie(name, value, days) {
// var d = new Date;
// d.setTime(d.getTime() + 24*60*60*1000*days);
// document.cookie = name + "=" + value + ";path=/;expires=" + d.toGMTString();
// }
// var edlp is provided by edlp_ajax.module file // var edlp is provided by edlp_ajax.module file
if(edlp.redirect){ if(edlp.redirect){
console.log('history redirect'); console.log('history redirect');
document.body.style.visibility = 'hidden';
// record current (will be origin) sys_path in cookie
// var cookiename = "edlp_origin_path";
// var cookie_value = edlp.sys_path.replace(/^\//, '') + '~~' + window.location.pathname;
// setCookie(cookiename, cookie_value, 1);
window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, '')); window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
window.localStorage.setItem('edlp_origin_url', window.location.pathname); window.localStorage.setItem('edlp_origin_url', window.location.pathname);
// redirect to home // redirect to home
window.location.replace(window.location.origin); window.location.replace(window.location.origin);
}else{ }else{
console.log('history do not redirect'); console.log('history do not redirect');
document.body.style.visibility = 'visible';
} }
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+1
View File
@@ -1,3 +1,4 @@
console.log('EDLP THEME MAIN.js');
(function($, Drupal, drupalSettings) { (function($, Drupal, drupalSettings) {
EdlpTheme = function(){ EdlpTheme = function(){
sites/all/themes/custom/edlptheme/edlptheme.info.yml
+1 -1
View File
@@ -5,8 +5,8 @@ base theme: classy
core: 8.x core: 8.x
libraries: libraries:
- core/normalize - core/normalize
- edlptheme/global-css
- edlptheme/history-js - edlptheme/history-js
- edlptheme/global-css
- edlptheme/global-js - edlptheme/global-js
# stylesheets-remove: # stylesheets-remove:
sites/all/themes/custom/edlptheme/edlptheme.libraries.yml
+6 -5
View File
@@ -1,21 +1,22 @@
global-css: global-css:
version: VERSION version: VERSION
css: css:
base: theme:
assets/dist/styles/app.min.css: {} assets/dist/styles/app.min.css: {}
history-js: history-js:
version: VERSION version: VERSION
header: true
js: js:
assets/dist/scripts/history.min.js: { weight:-998, scope: header } assets/dist/scripts/history.min.js: { weight:-998, preprocess: false, minified: true }
global-js: global-js:
version: VERSION version: VERSION
js: js:
# assets/dist/bower/jquery.hotkeys.js: { scope: footer } # assets/dist/bower/jquery.hotkeys.js: { scope: footer }
assets/dist/bower/imagesloaded.pkgd.min.js: { scope: footer } assets/dist/bower/imagesloaded.pkgd.min.js: { minified: true }
assets/dist/bower/masonry.pkgd.min.js: { scope: footer } assets/dist/bower/masonry.pkgd.min.js: { minified: true }
assets/dist/scripts/main.min.js: { scope: footer } assets/dist/scripts/main.min.js: { minified: true }
dependencies: dependencies:
- core/drupal - core/drupal
# - core/drupal.ajax # - core/drupal.ajax