diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-03 13:37:39 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-03 13:37:39 +0200 |
commit | f23c9d58d35da6e92b1679088e3c4715f0e76187 (patch) | |
tree | 11ab9133a8a41313fe2221dcaf3ab0b94205b620 /saclay_static/saclay/js/interface.js | |
parent | f7fd0f9e21288f5c7c1dc8095ac38cbab02187a0 (diff) | |
download | Chimère - projet Saclay-f23c9d58d35da6e92b1679088e3c4715f0e76187.tar.bz2 Chimère - projet Saclay-f23c9d58d35da6e92b1679088e3c4715f0e76187.zip |
Manage new popup
Diffstat (limited to 'saclay_static/saclay/js/interface.js')
-rw-r--r-- | saclay_static/saclay/js/interface.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/saclay_static/saclay/js/interface.js b/saclay_static/saclay/js/interface.js index 64cadca..d125161 100644 --- a/saclay_static/saclay/js/interface.js +++ b/saclay_static/saclay/js/interface.js @@ -172,8 +172,8 @@ function change_routing_transport(){ $('input[name="transport"]:checked').val()); } -function display_feature_detail(data, settings){ - settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>"); +function display_feature_detail_callback(settings){ + $('.popover-title').hide(); $('.detail_zoomin').bind("click", function(event){ $('#main-map').chimere('hidePopup', event); $('#main-map').chimere('zoomIn'); @@ -197,6 +197,7 @@ function display_feature_detail(data, settings){ jQuery(".close_img").click(function(event){ $("#main-map").chimere('hidePopup', event); }); + /* jQuery("#read_more_"+settings.current_feature.pk).click(function(){ $('#detail_content').css('height', $('#detail_content').height()); $("#description_short_"+settings.current_feature.pk).hide(); @@ -210,6 +211,7 @@ function display_feature_detail(data, settings){ $("#read_less_"+settings.current_feature.pk).hide(); $("#read_more_"+settings.current_feature.pk).show(); }); + */ $(document).ready(function(){ share_link_update(); $("a[rel^='prettyPhoto']").prettyPhoto({ @@ -220,10 +222,6 @@ function display_feature_detail(data, settings){ $('html').addClass('js-on'); $(function(){ // $('div.media-player').jmeEmbedControls(); - setTimeout(function(){ - settings.current_popup.updateSize(); - setTimeout(function(){ settings.current_popup.updateSize(); }, 1000); - }, 1000); }); } |