[linterna-magica-commit] [318] Fixes YouTube issues when height and width are missing in JavaScript.

[Ivaylo Valkov]

Revision: 318
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=318
Author:   valkov
Date:     2012-10-06 16:37:09 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Fixes YouTube issues when height and width are missing in JavaScript. Closes 
bugs #37514.

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

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

Modified: trunk/src/lm_site_youtube.js
===================================================================
--- trunk/src/lm_site_youtube.js        2012-09-18 06:33:00 UTC (rev 317)
+++ trunk/src/lm_site_youtube.js        2012-10-06 16:37:09 UTC (rev 318)
@@ -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*(\\\"|\\\')*"+
@@ -235,8 +236,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*(\\\"|\\\')*"+
@@ -354,8 +356,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;
@@ -385,6 +387,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+