summaryrefslogtreecommitdiff
path: root/chimere/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-14 16:11:15 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-14 16:11:15 +0100
commite70ee5519dadbc6cd6eec3ebbf3414251a163d0a (patch)
tree7be44c99cc0abc0c51c84c79e4091e142875a3d8 /chimere/templates
parentabcc53d4e630878a9f46d412916b2a056deb0e3c (diff)
downloadChimère-e70ee5519dadbc6cd6eec3ebbf3414251a163d0a.tar.bz2
Chimère-e70ee5519dadbc6cd6eec3ebbf3414251a163d0a.zip
Fix update share link management
Diffstat (limited to 'chimere/templates')
-rw-r--r--chimere/templates/chimere/blocks/map.html5
-rw-r--r--chimere/templates/chimere/blocks/share_bar.html27
2 files changed, 6 insertions, 26 deletions
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 3b75646..7c5370f 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -83,6 +83,11 @@ $("#{{map_id}}").show();
if (!permalink) $('#main-map').chimere('zoom', {'area':{{zoom}} });
{% endif %}
+ function update_permalink(){
+ alert("hop");
+ $('#main-map').chimere('update_permalink');
+ };
+
{{extra_map_def|safe}}
// init layer selection
diff --git a/chimere/templates/chimere/blocks/share_bar.html b/chimere/templates/chimere/blocks/share_bar.html
index 1c02ce3..a680aa8 100644
--- a/chimere/templates/chimere/blocks/share_bar.html
+++ b/chimere/templates/chimere/blocks/share_bar.html
@@ -9,32 +9,7 @@
{% endfor %}</ul>{% endif %}
<script language='text/javascript'>
$(function(){
- $('.share_link').click(function(){
- $('#main-map').chimere('update_permalink');
- var href = $(this).attr('href');
- var url = '{% url 'chimere:get-share-url' %}';
- var classes = $(this).attr('class').split(' ');
- prefix = 'share_id_';
- var share_id;
- for (idx=0;idx<classes.length;idx++){
- if(classes[idx].substring(0, prefix.length) == prefix){
- var share_id = classes[idx].substring(prefix.length);
- }
- }
- var params = $('#permalink').attr('href').split('#');
- url += share_id + "/" + params[params.length-1] + "/";
- $.ajax({url: url,
- dataType: "html",
- success: function (url) {
- window.open(url);
- return false;
- },
- error: function(){
- return false;
- }
- });
- return false;
- });
+ share_link_update();
});
</script>
{% endif %}