[linterna-magica-commit] [98] Fixes Blip.tv support in IceCat 4.0 and Abrowser 3.6.17.

[Ivaylo Valkov]

Revision: 98
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=98
Author:   valkov
Date:     2011-06-15 09:51:00 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
Fixes Blip.tv support in IceCat 4.0 and Abrowser 3.6.17. Closes (again) bugs 
#33556

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

Modified Paths:
--------------
    trunk/src/lm_forbidden_objects.js
    trunk/src/lm_site_bliptv.js
    trunk/src/lm_xhr.js

Modified: trunk/src/lm_forbidden_objects.js
===================================================================
--- trunk/src/lm_forbidden_objects.js   2011-06-14 22:48:24 UTC (rev 97)
+++ trunk/src/lm_forbidden_objects.js   2011-06-15 09:51:00 UTC (rev 98)
@@ -32,7 +32,11 @@
 // video object (ads and other)
 LinternaMagica.prototype.skip_objects =
     [ "brozar[a-z0-9]+_add_scroll",
-      "flashRateObject", "VideoCharts" ];
+      "flashRateObject", "VideoCharts", 
+      // Facebook iframes in blip.tv
+      "^f[0-9a-z]+",
+      // Blip.tv objects
+      "easyXDM_DISQUS_net_default[0-9]+_provider"];
 
 // Skip objects that has id matching a regex (see above array)
 LinternaMagica.prototype.skip_object_if_id = function(id_string)

Modified: trunk/src/lm_site_bliptv.js
===================================================================
--- trunk/src/lm_site_bliptv.js 2011-06-14 22:48:24 UTC (rev 97)
+++ trunk/src/lm_site_bliptv.js 2011-06-15 09:51:00 UTC (rev 98)
@@ -44,6 +44,10 @@
     jsonp_request_data.parser_function = this.parse_bliptv_jsonp_data;
     jsonp_request_data.user_data = object_data;
 
+    this.log("LinternaMagica.request_bliptv_jsonp_data:\n"+
+            "Requesting (JSONP) Blip.tv video link via video_id "+
+            object_data.video_id,1);
+
     this.create_checker_frame(jsonp_request_data);
 }
 

Modified: trunk/src/lm_xhr.js
===================================================================
--- trunk/src/lm_xhr.js 2011-06-14 22:48:24 UTC (rev 97)
+++ trunk/src/lm_xhr.js 2011-06-15 09:51:00 UTC (rev 98)
@@ -438,16 +438,27 @@
            // All the data is available in the XML, but it is not a
            // good idea to support the site in two places. JSON is
            // easier. The drawback is two requests.
-           var embed_id =
-               xml.getElementsByTagName("embedLookup");
+           try
+           {
+               var embed_id =
+                   xml.getElementsByTagName("embedLookup");
 
-           if (!embed_id)
+               // Firefox
+               if (embed_id && typeof(embed_id[0]) == "undefined")
+               {
+                   embed_id = 
+                       xml.getElementsByTagName("blip:embedLookup");
+               }
+
+               object_data.video_id = embed_id[0].textContent;
+               this.request_bliptv_jsonp_data(object_data);
+           }
+           catch(e)
            {
-               return null;
+               this.log("LinternaMagica.prototype.request_video"+
+                        "_link_parse_response:\n"+
+                        "Exception in Blip.tv while parsing XML",1);
            }
-
-           object_data.video_id = embed_id[0].textContent;
-           this.request_bliptv_jsonp_data(object_data);
            return null;
        }