From 05e3ada7fdf530a4becad413c7fb0e3e730e7b7b Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Sat, 6 Jan 2018 18:44:00 +0100 Subject: [PATCH] minor imporvements --- .../figli/edlp_corpus/assets/dist/scripts/corpus.min.js | 2 +- .../all/modules/figli/edlp_corpus/assets/scripts/corpus.js | 2 +- .../figli/edlp_corpus/src/Plugin/Block/BlockEntrees.php | 2 ++ .../themes/custom/edlptheme/assets/dist/styles/app.min.css | 4 ++-- .../themes/custom/edlptheme/assets/styles/base/_layout.scss | 6 +++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js b/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js index 226f946c7..02410c500 100644 --- a/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js +++ b/sites/all/modules/figli/edlp_corpus/assets/dist/scripts/corpus.min.js @@ -348,7 +348,7 @@ // console.log("Mouse pos: ", {x:_m_pos.x, y:_m_pos.y}); }) .on('click', function(event) { - if(event.target.tagName != "A"){ + if(event.target.tagName != "A" && event.target.tagName != "INPUT"){ console.log("Corpus : click", event); event.preventDefault(); if(_node_hover_id != -1){ diff --git a/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js b/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js index 226f946c7..02410c500 100644 --- a/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js +++ b/sites/all/modules/figli/edlp_corpus/assets/scripts/corpus.js @@ -348,7 +348,7 @@ // console.log("Mouse pos: ", {x:_m_pos.x, y:_m_pos.y}); }) .on('click', function(event) { - if(event.target.tagName != "A"){ + if(event.target.tagName != "A" && event.target.tagName != "INPUT"){ console.log("Corpus : click", event); event.preventDefault(); if(_node_hover_id != -1){ diff --git a/sites/all/modules/figli/edlp_corpus/src/Plugin/Block/BlockEntrees.php b/sites/all/modules/figli/edlp_corpus/src/Plugin/Block/BlockEntrees.php index fe03aeda9..a9eaafb2f 100644 --- a/sites/all/modules/figli/edlp_corpus/src/Plugin/Block/BlockEntrees.php +++ b/sites/all/modules/figli/edlp_corpus/src/Plugin/Block/BlockEntrees.php @@ -66,6 +66,8 @@ class BlockEntrees extends BlockBase { $description = $term->get('description')->value; // dpm($description); + // TODO: output block through twig and preprocess function + // TODO: load corpus map libraries only with this block $entree = array( '#wrapper_attributes' => array( 'class' => array('term-'.$term->id(), 'entree'), diff --git a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css index 2ef4c145e..0f167ca32 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css +++ b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css @@ -40,12 +40,12 @@ main[role="main"] { width: 100%; height: 100%; overflow: hidden; } + main[role="main"] .layout-content > * { + pointer-events: auto; } main[role="main"] .layout-content, main[role="main"] .region-content, main[role="main"] #block-edlptheme-content { width: 100%; height: 100%; overflow: hidden; } - main[role="main"] .kint { - pointer-events: auto; } footer[role="contentinfo"] { position: fixed; diff --git a/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss b/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss index f26f7604f..a315609cf 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss @@ -32,13 +32,13 @@ main[role="main"]{ padding:7em 2em 9em; width:100%; height:100%; overflow: hidden; + .layout-content>*{ + pointer-events: auto; + } .layout-content, .region-content, #block-edlptheme-content{ width: 100%; height:100%; overflow:hidden; } - .kint{ - pointer-events: auto; - } } footer[role="contentinfo"]{