[linterna-magica-commit] [324] Mering r323 from trunk.

[Ivaylo Valkov]

Revision: 324
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=324
Author:   valkov
Date:     2012-11-03 14:42:25 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
Mering r323 from trunk. Fixes bugs #37630.

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=323

Ticket Links:
------------
    http://savannah.gnu.org/bugs/?37630

Modified Paths:
--------------
    branches/0.0.12/src/lm_site_youtube.js

Property Changed:
----------------
    branches/0.0.12/


Property changes on: branches/0.0.12
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:287,292,314,318
   + /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:287,292,314,318,323

Modified: branches/0.0.12/src/lm_site_youtube.js
===================================================================
--- branches/0.0.12/src/lm_site_youtube.js      2012-11-03 14:40:30 UTC (rev 
323)
+++ branches/0.0.12/src/lm_site_youtube.js      2012-11-03 14:42:25 UTC (rev 
324)
@@ -604,6 +604,35 @@
            // will not be displaced.
            html5_wrapper.style.setProperty('display', "none", "important");
 
+           // If the HTML5 player has a fallback CSS class and LM can
+           // access it it means there is no other option for
+           // playback. We take over the player.
+           //
+           // See bug 37630
+           // https://savannah.nongnu.org/bugs/index.php?37630
+           if (this.priority.html5 > this.priority.self)
+           {
+               // It should be available, because it is used above in
+               // this function
+               id = id ? id : object_data.linterna_magica_id;
+
+               this.show_lm_interface(object_data.linterna_magica_id);
+           
+               // It should be available, because it is used above in
+               // this functon.
+               toggle_plugin = toggle_plugin  ? toggle_plugin :
+                   document.getElementById("linterna-magica-"+
+                                           "toggle-plugin-"+id);
+
+               toggle_plugin.parentNode.removeChild(toggle_plugin);
+
+               toggle_plugin_header =
+                   document.getElementById("linterna-magica-"+
+                                           "toggle-plugin-header-"+id);
+               
+               
toggle_plugin_header.parentNode.removeChild(toggle_plugin_header);
+           }
+           
            // Hide site controls and video container. Should not
            // overlap with Linterna Magica now. Fixes the overlapping
            // of HTML5 player and LM.