# HG changeset patch # User grandjoncl # Date 1349966345 -7200 # Node ID ca38abd140b3db935b589edccfa1b98c1928cd26 # Parent 7f237270b61cacf04e8852aa8268827780ae5d68 Corrections of the code for the embed popup. Functions are now in the embed_popup.js With chrome the player used to play the video even when it wasn't supposed to be displayed and kept playing when we hid the player. When we changed between div and iframe the player started even when it was suppose to be hidden. It's now solved. diff -r 7f237270b61c -r ca38abd140b3 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Wed Oct 10 18:07:40 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Thu Oct 11 16:39:05 2012 +0200 @@ -1,5 +1,4 @@ {% load i18n %} -{% load set_var %} {% load analytics %} - - - - @@ -77,7 +39,6 @@ {% trans 'Show Player' %}
@@ -89,9 +50,9 @@

-
- {% trans 'Use the div integration mode' %}
- {% trans 'Use the iframe integration mode' %}
+
+ {% trans 'Use the div integration mode' %}
+ {% trans 'Use the iframe integration mode' %}

diff -r 7f237270b61c -r ca38abd140b3 src/ldt/ldt/static/ldt/js/embed_popup.js --- a/src/ldt/ldt/static/ldt/js/embed_popup.js Wed Oct 10 18:07:40 2012 +0200 +++ b/src/ldt/ldt/static/ldt/js/embed_popup.js Thu Oct 11 16:39:05 2012 +0200 @@ -69,4 +69,97 @@ }); +function toggle() { + wrapper="wrapper_"+player_id; + wrapper_id="#"+wrapper; + var element = document.getElementById(wrapper); + var text = document.getElementById("displayPlayer"); + var type_embed=document.getElementById("type_embed_div"); + if(element.style.display==="none") { + if (type_embed.checked){ + var new_code=document.getElementById("embed_code_var").value; + $j(wrapper_id).html(new_code); + } + else{ + wrapper = "#wrapper_"+player_id; + iframeUrl= iframe_url+"&polemic="+polemic+"&show_mic_record="+show_mic_record+"&annotations_list="+annotations_list+""; + player_width=570; + player_height=678; + if(annotations_list!='False'){ + player_width+=430; + } + if(polemic!='False'){ + player_height+=100; + + } + if(show_mic_record!='False'){ + + player_height+=55; + } + frame = document.createElement("iframe"); + frame.width = player_width; + frame.height = player_height; + frame.src = iframeUrl; + frame.frameBorder = 0; + frame.seamless = "seamless"; + $j(wrapper).html(frame); + + } + element.style.display="block"; + text.innerHTML = translate_hide; + } + else { + $j(wrapper_id).html(''); + element.style.display="none"; + text.innerHTML = translate_show; + } +} +function div_event(){ + wrapper = "wrapper_"+player_id; + wrapper_id = "#"+wrapper; + var element = document.getElementById(wrapper); + var new_code=document.getElementById("embed_code_var").value; + var code_embed=document.getElementById("player_id_code"); + if(element.style.display=="block"){ + $j(wrapper_id).html(new_code); + } + code_embed.value= new_code; + $j("#player_id_code").focus(); + $j("#player_id_code").select(); +} + +function iframe_event(){ + var code_embed=document.getElementById("player_id_code"); + wrapper = "wrapper_"+player_id; + wrapper_id = "#"+wrapper; + var element = document.getElementById(wrapper); + iframeUrl= iframe_url+"&polemic="+polemic+"&show_mic_record="+show_mic_record+"&annotations_list="+annotations_list+""; + player_width=570; + player_height=678; + if(annotations_list!='False'){ + player_width+=430; + } + if(polemic!='False'){ + player_height+=100; + + } + if(show_mic_record!='False'){ + + player_height+=55; + } + + if(element.style.display=="block"){ + frame = document.createElement("iframe"); + frame.width = player_width; + frame.height = player_height; + frame.src = iframeUrl; + frame.frameBorder = 0; + frame.seamless = "seamless"; + $j(wrapper_id).html(frame); + } + iframe_code=""; + $j("#player_id_code").val(iframe_code); + $j("#player_id_code").focus(); + $j("#player_id_code").select(); +}