From 6695367715f45660651f5063e394bd403761589a Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 5 Oct 2016 13:13:55 +0200
Subject: De-activate (temporary?) prettyPhoto

---
 chimere/static/chimere/js/jquery.chimere.js           | 3 ++-
 chimere/templates/chimere/blocks/multimedia_file.html | 4 +++-
 chimere/templates/chimere/main_map.html               | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 9ee0c49..9b0f386 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -780,7 +780,8 @@ function transform(obj) {
          * hovering management
          */
         _is_popuphovering: function(){
-            if ($('.popover-content:hover').length > 0){
+            if ($('.popover-content').is(':visible') &&
+                    $('.popover-content:hover').length > 0){
                 for (idx in settings.deactivate_on_hover){
                     settings.deactivate_on_hover[idx].setActive(false);
                     return true;
diff --git a/chimere/templates/chimere/blocks/multimedia_file.html b/chimere/templates/chimere/blocks/multimedia_file.html
index a360a9e..525702e 100644
--- a/chimere/templates/chimere/blocks/multimedia_file.html
+++ b/chimere/templates/chimere/blocks/multimedia_file.html
@@ -1,6 +1,8 @@
 {% load i18n %}
 {% if multimedia_item.picture %}
-<a rel="prettyPhoto" href='{{multimedia_item.picture.url}}' ><img class='media-img thumbnail' alt="{{multimedia_item.name}}" src='{{multimedia_item.thumbnailfile.url}}'/></a>{% endif %}
+{#}<a rel="prettyPhoto" href='{{multimedia_item.picture.url}}'>{#}
+<img class='media-img thumbnail' alt="{{multimedia_item.name}}" src='{{multimedia_item.thumbnailfile.url}}'/>
+{#}</a>{#}{% endif %}
 {% if multimedia_item.url %}
 
 {% if multimedia_item.multimedia_type.iframe %}
diff --git a/chimere/templates/chimere/main_map.html b/chimere/templates/chimere/main_map.html
index cb83642..e215c56 100644
--- a/chimere/templates/chimere/main_map.html
+++ b/chimere/templates/chimere/main_map.html
@@ -3,7 +3,7 @@
 {% block extra_head %}
 {% head_jquery %}
 {% head_chimere %}
-{% head_jme %}
+{% comment %}{% head_jme %}{% endcomment %}
 <script src="{{ STATIC_URL }}chimere/js/jquery.chimere.js" type="text/javascript"></script>
 {% if has_search %}
 <script src="{{ STATIC_URL }}chimere/js/search.js" type="text/javascript"></script>
-- 
cgit v1.2.3