[linterna-magica-commit] [386] YouTube loading when the site HTML5 player has higher priority.

[Ivaylo Valkov]

Revision: 386
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=386
Author:   valkov
Date:     2013-01-03 06:18:18 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
 YouTube loading when the site HTML5 player has higher priority.

Fixed glitches for the toggle plugin button outside the LM interface
in YouTube.

Modified Paths:
--------------
    trunk/src/lm_interface_toggle_plugin.js
    trunk/src/lm_site_youtube.js

Modified: trunk/src/lm_interface_toggle_plugin.js
===================================================================
--- trunk/src/lm_interface_toggle_plugin.js     2013-01-01 15:54:41 UTC (rev 
385)
+++ trunk/src/lm_interface_toggle_plugin.js     2013-01-03 06:18:18 UTC (rev 
386)
@@ -195,8 +195,6 @@
            this.hide_site_html5_player(html5_parent);
        }
 
-       lm_interface.parentNode.style.setProperty("height",
-                                                 "auto", "important");
        this.show_lm_interface(linterna_magica_id);
 
        // Init the web controls
@@ -247,7 +245,6 @@
            this.show_or_hide_update_info(null, update_info);
        }
 
-       lm_interface.parentNode.style.removeProperty("height");
        this.hide_lm_interface(linterna_magica_id);
        
        // External toggle plugin link

Modified: trunk/src/lm_site_youtube.js
===================================================================
--- trunk/src/lm_site_youtube.js        2013-01-01 15:54:41 UTC (rev 385)
+++ trunk/src/lm_site_youtube.js        2013-01-03 06:18:18 UTC (rev 386)
@@ -628,17 +628,18 @@
            {
                // It should be available, because it is used above in
                // this function
-               id = id ? id : object_data.linterna_magica_id;
+               var id = object_data.linterna_magica_id;
 
-               this.show_lm_interface(object_data.linterna_magica_id);
+               this.show_lm_interface(id);
            
                // It should be available, because it is used above in
                // this functon.
-               toggle_plugin = toggle_plugin  ? toggle_plugin :
+               toggle_plugin = 
                    document.getElementById("linterna-magica-"+
                                            "toggle-plugin-"+id);
 
-               toggle_plugin.parentNode.removeChild(toggle_plugin);
+               var pn = toggle_plugin.parentNode.parentNode;
+               pn.removeChild(toggle_plugin.parentNode);
 
                toggle_plugin_header =
                    document.getElementById("linterna-magica-"+
@@ -666,6 +667,24 @@
        }
     }
 
+    // Without this the toggle plugin stays hidden below the title of
+    // the clip
+    var watch7 = document.getElementById('watch7-player');
+    if (watch7)
+    {
+       watch7.style.setProperty("height", 
+                                (parseInt(object_data.outer_height)+
+                                 24)+"px", "important");
+
+       var movie_player = document.getElementById("movie_player");
+       if (movie_player)
+       {
+           movie_player.style.setProperty("height", 
+                                          parseInt(object_data.outer_height)+
+                                          "px", "important");
+       }
+    }
+
     return false;
 }