Browse Source

removed ajax-link from logo in mobile site

Bachir Soussi Chiadmi 6 years ago
parent
commit
14be53519a

+ 2 - 1
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js

@@ -30,7 +30,8 @@ if(state.entree_tid){openEntree(state.entree_tid);}
 history.replaceState(state,null,edlp_origin.url+edlp_origin.hash);window.localStorage.removeItem("edlp_origin");}else{history.replaceState({home:true},null,window.location.pathname+window.location.hash);initGrid();_$body.attr('booted','booted');}};function onHistoryPopState(e){void 0;if(e.state.home){backToFrontPage(true);}
 else if(e.state.audio){_audioPlayer.openDocument(e.state.node,'popstate',e.state.historic_index);}
 else{if(e.state.entree_tid){openEntree(e.state.entree_tid);}
-if(e.state.ajax_path){e.state.url=null;ajaxLoadContent(e.state);}}};function initAjaxLinks(){$('a.site-name','#block-edlptheme-branding').add('a','#block-mainnavigation').add('a','#block-mainnavigation-2').add('a','#block-footer.menu--footer').add('a','#block-productions').add('a','article.node:not(.node--type-enregistrement) h2.node-title').add('a','.productions-subtree').add('a','.productions-parent').add('a','.field--name-field-son').addClass('ajax-link');$('a[data-drupal-link-system-path="<front>"]','#block-mainnavigation').removeClass('is-active');_$ajaxLinks=$('.ajax-link');activateAjaxLinks();};function activateAjaxLinks(){_$ajaxLinks.each(function(i,e){var $this=$(this);if($this.is('.ajax-enable'))return;if($this.attr('data-drupal-link-system-path')||$this.is('[type^="audio"]')){$this.on('click',onClickAjaxLink).addClass('ajax-enable');}});};function onClickAjaxLink(e){e.preventDefault();var $link=$(this);if($link.is('.is-active')&&!$link.is('.site-name'))
+if(e.state.ajax_path){e.state.url=null;ajaxLoadContent(e.state);}}};function initAjaxLinks(){$('a','#block-mainnavigation').add('a','#block-mainnavigation-2').add('a','#block-footer.menu--footer').add('a','#block-productions').add('a','article.node:not(.node--type-enregistrement) h2.node-title').add('a','.productions-subtree').add('a','.productions-parent').add('a','.field--name-field-son').addClass('ajax-link');if(!_is_mobile){$('a.site-name','#block-edlptheme-branding').addClass('ajax-link');}
+_$ajaxLinks=$('.ajax-link');activateAjaxLinks();};function activateAjaxLinks(){_$ajaxLinks.each(function(i,e){var $this=$(this);if($this.is('.ajax-enable'))return;if($this.attr('data-drupal-link-system-path')||$this.is('[type^="audio"]')){$this.on('click',onClickAjaxLink).addClass('ajax-enable');}});};function onClickAjaxLink(e){e.preventDefault();var $link=$(this);if($link.is('.is-active')&&!$link.is('.site-name'))
 return false;if($link.is('.audio-link')){caller=$link.parents('.lastdocs').length?'lastdocs':null;_audioPlayer.emmit('stop-shuffle').openDocument({nid:$link.attr('nid'),audio_url:$link.attr('audio_url'),title:$link.find('.field--name-title').html()},caller);return false;}
 if($link.is('[type^="audio"]')){_audioPlayer.emmit('stop-shuffle').openSound($link.attr('href'),$link.html());return false;}
 var sys_path=$(this).attr('data-drupal-link-system-path');if(sys_path=='<front>'){if(!_is_mobile){if($link.is('.is-active')&&_corpus_ready){_$corpus_canvas.trigger({'type':'shuffle-collection'});}else{backToFrontPage();}

+ 4 - 7
sites/all/themes/custom/edlptheme/assets/scripts/main.js

@@ -702,8 +702,7 @@
     function initAjaxLinks(){
       // console.log('initAjaxLinks');
 
-      $('a.site-name', '#block-edlptheme-branding')
-        .add('a', '#block-mainnavigation')
+      $('a', '#block-mainnavigation')
         .add('a', '#block-mainnavigation-2')
         // .add('a', '.block.language-switcher-language-url')
         .add('a', '#block-footer.menu--footer')
@@ -716,15 +715,13 @@
         .add('a', '.field--name-field-son')
         .addClass('ajax-link');
 
-      $('a[data-drupal-link-system-path="<front>"]', '#block-mainnavigation').removeClass('is-active');
+      if(!_is_mobile){
+        $('a.site-name', '#block-edlptheme-branding').addClass('ajax-link');
+      }
 
       _$ajaxLinks = $('.ajax-link');
       activateAjaxLinks();
     };
-    // function initAudioLinks(){
-    //   _$ajaxLinks = $('.ajax-link.audio-link');
-    //   activateAjaxLinks();
-    // };
     function activateAjaxLinks(){
       // $('.ajax-link:not(.ajax-enabled)')
       _$ajaxLinks.each(function(i,e){