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

home for mobile is ok

Browse Source
This commit is contained in:
bachir
2018-04-26 21:41:43 +02:00
parent 2ee7077ecf
commit f0c2883d0e
24 changed files with 7999 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+3 -3
View File
@@ -24,8 +24,8 @@
function init(){
console.log("EdlpTheme init()");
if(!drupalSettings.path.isFront)
return;
// if(!drupalSettings.path.isFront)
// return;
initEvents();
@@ -1659,7 +1659,7 @@
} // end EdlpTheme()
$(document).ready(function($) {
if(drupalSettings.path.isFront){
if(drupalSettings.path.isFront && !edlp_mobile.device_is_mobile){
var edlptheme = new EdlpTheme();
}else{
$('body').attr('booted', 'booted');
sites/all/themes/custom/edlptheme/assets/scripts/redirect.js
+12 -8
View File
@@ -7,33 +7,37 @@ function checkMobile(){
// var edlp_mobile is provided by edlp_mobile.module file
if(typeof edlp_mobile != "undefined"){
console.log(edlp_mobile);
console.log('window.location', window.location);
// console.log(edlp_mobile);
// console.log('window.location', window.location);
var device_redirect = false;
var device_is_mobile = checkMobile();
console.log('is_mobile_domain', edlp_mobile.is_mobile_domain);
console.log('device_is_mobile', device_is_mobile);
// console.log('is_mobile_domain', edlp_mobile.is_mobile_domain);
// console.log('device_is_mobile', device_is_mobile);
edlp_mobile.device_is_mobile = device_is_mobile;
switch(true){
case (device_is_mobile && !edlp_mobile.is_mobile_domain):
console.log('redirect to mobile domain', window.location.protocol +'//'+ edlp_mobile.mobile_url);
// console.log('redirect to mobile domain', window.location.protocol +'//'+ edlp_mobile.mobile_url);
device_redirect = true;
// TODO: redirect to mobile domain
window.location.replace(window.location.protocol +'//'+ edlp_mobile.mobile_url);
break;
case (edlp_mobile.is_mobile_domain && !device_is_mobile):
console.log('redirect to desktop domain', window.location.protocol +'//'+ edlp_mobile.desktop_url);
// console.log('redirect to desktop domain', window.location.protocol +'//'+ edlp_mobile.desktop_url);
device_redirect = true;
// TODO: redirect to desktop domain
window.location.replace(window.location.protocol +'//'+ edlp_mobile.desktop_url);
break;
default:
console.log('do not redirect');
// console.log('do not redirect');
break;
}
if(device_is_mobile){
document.documentElement.className += "is-mobile";
}
}
// var edlp is provided by edlp_ajax.module file
if(edlp.redirect && !device_redirect){
if(edlp.redirect && !device_redirect && !device_is_mobile){
console.log('redirect', edlp);
console.log('window.location', window.location);
// window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));