summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-07-06 10:47:13 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-07-06 10:47:13 +0200
commit38c579e2141d15aff342af99020a64a5e0245d4d (patch)
treec6cbe4353c90a92618674d1744bc67137f939fda
parentda1b25a794eefd4a7ab4b23f9c19091b8f1934f5 (diff)
downloadChimère-38c579e2141d15aff342af99020a64a5e0245d4d.tar.bz2
Chimère-38c579e2141d15aff342af99020a64a5e0245d4d.zip
Fix TinyMCE / bootstrap bad interaction
-rw-r--r--chimere/admin.py1
-rw-r--r--chimere/static/saclay/js/interface.js5
2 files changed, 6 insertions, 0 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index c60f4fe..10672e3 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -417,6 +417,7 @@ class PictureRouteInline(PictureMarkerInline):
class MultimediaRouteInline(MultimediaMarkerInline):
exclude = ('polygon', 'marker')
+
admin.site.register(RouteFile)
diff --git a/chimere/static/saclay/js/interface.js b/chimere/static/saclay/js/interface.js
index 2e37f09..cd30561 100644
--- a/chimere/static/saclay/js/interface.js
+++ b/chimere/static/saclay/js/interface.js
@@ -314,6 +314,11 @@ $(function(){
$("#mobile-footer-open-img").click(function(event){
$("body").removeClass('mobile-footer-hidden');
});
+ $(document).on('focusin', function(e) {
+ if ($(e.target).closest(".mce-window").length) {
+ e.stopImmediatePropagation();
+ }
+ });
});
function change_routing_speed(){