[linterna-magica-commit] [127] Merging r126 from trunk

[Ivaylo Valkov]

Revision: 127
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=127
Author:   valkov
Date:     2011-07-12 09:02:06 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Merging r126 from trunk

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

Modified Paths:
--------------
    branches/task-11216/src/lm_extract_js_swfobject.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
   + /branches/0.0.9:94
/trunk:103,106-107,113,115,123,126

Modified: branches/task-11216/src/lm_extract_js_swfobject.js
===================================================================
--- branches/task-11216/src/lm_extract_js_swfobject.js  2011-07-12 09:01:05 UTC 
(rev 126)
+++ branches/task-11216/src/lm_extract_js_swfobject.js  2011-07-12 09:02:06 UTC 
(rev 127)
@@ -29,13 +29,10 @@
 
 // Extracts object data for flash objects created with SWFObject (v1 && v2)
 // flash library
-// This also extracts objects created with  new Flash() (novatv).bg
-// because of great simillarity in processing and arguments
 LinternaMagica.prototype.extract_object_from_script_swfobject = function()
 {
     var constructor_re = new RegExp(
-       "(swfobject.embedSWF|(\\\w+)\\\s*=\\\s*new\\\s*SWFObject|"+
-           "new\\\s*Flash)\\\("+
+       "(swfobject.embedSWF|(\\\w+)\\\s*=\\\s*new\\\s*SWFObject)\\\("+
            "([^,]+)"+
            "\\\s*,\\\s*([^,]+)"+
            "\\\s*,\\\s*([^,]+)"+
@@ -65,8 +62,7 @@
     {
        // variable_name = constructor[2]
        var id_re = new RegExp(
-           (/novatv\.bg/i.test(window.location.hostname)
-            ?  "(\\.)*" : constructor[2]+"\\.")+
+           constructor[2]+"\\."+
                "write\\("+"("+"\\'"+'|\\"'+")*"+
                "([A-Za-z0-9_-]+)"+"("+"\\'"+'|\\"'+")*"+
                "\\)",