[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linterna-magica-commit] [132] Merging SWFObject fixes from r131 in trun
From: |
Ivaylo Valkov |
Subject: |
[linterna-magica-commit] [132] Merging SWFObject fixes from r131 in trunk. |
Date: |
Fri, 15 Jul 2011 10:42:31 +0000 |
Revision: 132
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=132
Author: valkov
Date: 2011-07-15 10:42:31 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Merging SWFObject fixes from r131 in trunk.
Revision Links:
--------------
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=131
Modified Paths:
--------------
branches/task-11216/src/lm_extract_js_swfobject.js
Modified: branches/task-11216/src/lm_extract_js_swfobject.js
===================================================================
--- branches/task-11216/src/lm_extract_js_swfobject.js 2011-07-15 10:40:53 UTC
(rev 131)
+++ branches/task-11216/src/lm_extract_js_swfobject.js 2011-07-15 10:42:31 UTC
(rev 132)
@@ -32,7 +32,8 @@
LinternaMagica.prototype.extract_object_from_script_swfobject = function()
{
var constructor_re = new RegExp(
- "(swfobject.embedSWF|(\\\w+)\\\s*=\\\s*new\\\s*SWFObject)\\\("+
+ "(swfobject.embedSWF|(\\\w+|window\\\[\\\"\\\w+\\\"\\\])\\\s*="+
+ "\\\s*new\\\s*SWFObject)\\\("+
"([^,]+)"+
"\\\s*,\\\s*([^,]+)"+
"\\\s*,\\\s*([^,]+)"+
@@ -61,8 +62,12 @@
if (!document.getElementById(el))
{
// variable_name = constructor[2]
+ var var_name =
+ constructor[2].replace(/window\[\"/,"").
+ replace(/\"\]/,"");
+
var id_re = new RegExp(
- constructor[2]+"\\."+
+ var_name+"\\."+
"write\\("+"("+"\\'"+'|\\"'+")*"+
"([A-Za-z0-9_-]+)"+"("+"\\'"+'|\\"'+")*"+
"\\)",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [linterna-magica-commit] [132] Merging SWFObject fixes from r131 in trunk.,
Ivaylo Valkov <=