Ver Fonte

click on site-name on front page shuffles the map

Bachir Soussi Chiadmi há 7 anos atrás
pai
commit
51e9aa59f7

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js


+ 4 - 0
sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js

@@ -1030,6 +1030,10 @@
           console.log('scramble-collection', e);
           // resolveNormalPosAllNodes();
           scrambleCollection();
+        })
+        .on('shuffle-collection', function(e){
+          console.log('shuffle-collection', e);
+          onResizeCanvas();
         });
 
       _$entrees_block_termlinks.on('click', function(event) {

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

@@ -27,10 +27,11 @@ 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-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:not(.ajax-enabled)').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'))
+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-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:not(.ajax-enabled)').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')){_audioPlayer.emmit('stop-shuffle').openDocument({nid:$link.attr('nid'),audio_url:$link.attr('audio_url'),title:$link.find('.field--name-title').html()});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>'){backToFrontPage();return false;}
+var sys_path=$(this).attr('data-drupal-link-system-path');if(sys_path=='<front>'){if($link.is('.is-active')&&_corpus_ready){_$corpus_canvas.trigger({'type':'shuffle-collection'});}else{backToFrontPage();}
+return false;}
 var view_mode=$link.attr('viewmode');var state=getSysPathState(sys_path,view_mode);state.url=$(this).attr('href');if(view_mode){state.url+="#"+view_mode;}
 if($link.is('[selector]')){state.selector=$link.attr('selector');}
 $link.addClass('ajax-loading');ajaxLoadContent(state);return false;};function onCorpusMapReady(e){_corpus_ready=true;_$corpus_canvas=$('canvas#corpus-map');_$corpus_canvas.on('corpus-cliked-on-map',function(e){backToFrontPage();}).on('corpus-cliked-on-node',function(e){_audioPlayer.emmit('stop-shuffle').setAutoOpenArticle(e.article).openDocument(e.target_node);});_randomPlayer=new RandomPlayer(e.playlist);_$body.attr('corpus-map','ready');}

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

@@ -680,7 +680,7 @@
       e.preventDefault();
       var $link = $(this);
 
-      if($link.is('.is-active'))
+      if($link.is('.is-active') && !$link.is('.site-name'))
         return false;
 
       // Audio links
@@ -719,7 +719,11 @@
       // front page
       // just remove contents and stop here
       if(sys_path == '<front>'){
-        backToFrontPage();
+        if($link.is('.is-active') && _corpus_ready){
+          _$corpus_canvas.trigger({'type':'shuffle-collection'});
+        }else{
+          backToFrontPage();
+        }
         return false;
       }
 

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff