[linterna-magica-commit] [319] Mergin r318 from trunk to branch 0.0.12.

[Ivaylo Valkov]

Revision: 319
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=319
Author:   valkov
Date:     2012-10-06 17:46:16 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Mergin r318 from trunk to branch 0.0.12. Fixes YouTube. Bugs #37514.

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

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

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

Modified: branches/0.0.12/src/lm_site_youtube.js
===================================================================
--- branches/0.0.12/src/lm_site_youtube.js      2012-10-06 16:37:09 UTC (rev 
318)
+++ branches/0.0.12/src/lm_site_youtube.js      2012-10-06 17:46:16 UTC (rev 
319)
@@ -28,8 +28,9 @@
 // END OF LICENSE HEADER
 
 // Extract youtube fmt parameter
-LinternaMagica.prototype.extract_youtube_fmt_parameter = function(data)
+LinternaMagica.prototype.extract_youtube_fmt_parameter = function()
 {
+    var data = this.script_data;
     var fmt_re = new RegExp (
        "(\\\"|\\\'|\\\&)fmt_list"+
            "(\\\"|\\\')*(\\\=|\\\:|,)\\\s*(\\\"|\\\')*"+
@@ -233,8 +234,9 @@
 }
 
 // Extract links data for youtube from fmt_url_map
-LinternaMagica.prototype.extract_youtube_fmt_url_map = function(data)
+LinternaMagica.prototype.extract_youtube_fmt_url_map = function()
 {
+    var data = this.script_data;
     var fmt_re = new RegExp (
        "(\\\"|\\\'|\\\&|\\\&)url_encoded_fmt_stream_map"+
            "(\\\"|\\\')*(\\\=|\\\:|,)\\\s*(\\\"|\\\')*"+
@@ -348,8 +350,8 @@
 
     this.extract_video_id_data = data;
 
-    var fmt = this.extract_youtube_fmt_parameter(data);
-    var maps = this.extract_youtube_fmt_url_map(data);
+    var fmt = this.extract_youtube_fmt_parameter();
+    var maps = this.extract_youtube_fmt_url_map();
 
     var hd_links = this.create_youtube_links(fmt, maps);
     var link = (hd_links && hd_links.length) ? hd_links : null;
@@ -379,6 +381,13 @@
 
     if (!width || !height)
     {
+       var p = document.getElementById("watch-player");
+       height = p ? p.clientHeight : null;
+       width  = p ? p.clientWidth : null;
+    }
+
+    if (!width || !height)
+    {
        this.log("LinternaMagica.extract_object_from_script_youtube:\n"+
                 "Missing object data "+
                 "\n H: "+height+