[linterna-magica-commit] [147] Changes for tasks #11216.

[Ivaylo Valkov]

Revision: 147
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=147
Author:   valkov
Date:     2011-07-20 16:08:35 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
Changes for tasks #11216. Merging blip.tv fix from trunk.

Ticket Links:
------------
    http://savannah.gnu.org/task/?11216

Modified Paths:
--------------
    branches/task-11216/src/lm_extract_dom_objects.js

Property Changed:
----------------
    branches/task-11216/


Property changes on: branches/task-11216
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.0.9:94
/trunk:103,106-107,113,115,123,126,131,136,139
   + /branches/0.0.9:94
/trunk:103,106-107,113,115,123,126,131,136,139,146

Modified: branches/task-11216/src/lm_extract_dom_objects.js
===================================================================
--- branches/task-11216/src/lm_extract_dom_objects.js   2011-07-19 16:21:17 UTC 
(rev 146)
+++ branches/task-11216/src/lm_extract_dom_objects.js   2011-07-20 16:08:35 UTC 
(rev 147)
@@ -235,11 +235,16 @@
            }
            else if (object_data.video_id)
            {
-               if (!/blip\.tv/i.test(window.location.hostname) &&
-                        ((object.hasAttribute('src') &&
-                         /blip\.tv/i.test(object.getAttribute('src'))) ||
-                        (object.hasAttribute('data') && 
-                         /blip\.tv/i.test(object.getAttribute('data')))))
+               if ((!/blip\.tv/i.test(window.location.hostname) &&
+                    ((object.hasAttribute('src') &&
+                      /blip\.tv/i.test(object.getAttribute('src'))) ||
+                     (object.hasAttribute('data') && 
+                      /blip\.tv/i.test(object.getAttribute('data'))))) || 
+                   (/blip\.tv/i.test(window.location.hostname) && 
+                    ((object.hasAttribute('src') &&
+                      /blip\.tv\/play/i.test(object.getAttribute('src'))) ||
+                     (object.hasAttribute('data') && 
+                      /blip\.tv\/play/i.test(object.getAttribute('data'))))))
                {
                    this.request_bliptv_jsonp_data(object_data);
                }