[linterna-magica-commit] [341] Merging r340 from trunk to branch 0.0.12.

[Ivaylo Valkov]

Revision: 341
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=341
Author:   valkov
Date:     2012-12-08 13:22:22 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Merging r340 from trunk to branch 0.0.12. Better fix for YouTube than
r338 & r339 for bugs #37881.

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

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

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,323,327,338
   + /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:287,292,314,318,323,327,338,340

Modified: branches/0.0.12/src/lm_site_youtube.js
===================================================================
--- branches/0.0.12/src/lm_site_youtube.js      2012-12-08 13:18:49 UTC (rev 
340)
+++ branches/0.0.12/src/lm_site_youtube.js      2012-12-08 13:22:22 UTC (rev 
341)
@@ -379,10 +379,12 @@
        embed_id= embed_id[embed_id.length-1];
     }
 
+    var p = this.get_first_element_by_class("flash-player");
+    p = p ? p : this.get_first_element_by_class("html5-player");
+
+
     if (!width || !height)
     {
-       var p = this.get_first_element_by_class("player-root");
-
        height = p ? p.clientHeight : null;
        width  = p ? p.clientWidth : null;
     }
@@ -434,7 +436,7 @@
        linterna_magica_id =
            this.mark_flash_object("extracted-from-script");
 
-       object_data.parent =  this.get_first_element_by_class("player-root");
+       object_data.parent =  p;
     }
 
     object_data.linterna_magica_id = linterna_magica_id;