Merge branch 'master-v2.2' into saclay-v2.2

Conflicts:
	static/saclay/css/styles.css
	templates/chimere/detail.html

1 files changed, 4 insertions, 10 deletions

diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 8c7eb6b..e004ce4 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -145,11 +145,6 @@ $(function(){
         return false;
     });
 
-    $('.share-icon').click(function(){
-        $(this).hide();
-        $(this).nextAll('.shared').show();
-        return false;
-    });
     $('.print-page').click(function(){
         window.print();
         return false;
@@ -222,11 +217,6 @@ function display_feature_detail(data, settings){
         $("#read_less_"+settings.current_feature.pk).hide();
         $("#read_more_"+settings.current_feature.pk).show();
     });
-    $('.share-icon').click(function(){
-        $(this).hide();
-        $(this).parent().nextAll('.shared').show();
-        return false;
-    });
     $(document).ready(function(){
         share_link_update();
         $("a[rel^='prettyPhoto']").prettyPhoto({
@@ -237,6 +227,10 @@ 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);
     });
 }