[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linterna-magica-commit] [131] Fix for SWFObject constructors.
From: |
Ivaylo Valkov |
Subject: |
[linterna-magica-commit] [131] Fix for SWFObject constructors. |
Date: |
Fri, 15 Jul 2011 10:40:54 +0000 |
Revision: 131
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=131
Author: valkov
Date: 2011-07-15 10:40:53 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Fix for SWFObject constructors. The variable could be defined in the window
object. Fixes Facebook support without Gnash installed.
Modified Paths:
--------------
trunk/src/lm_extract_js_swfobject.js
Modified: trunk/src/lm_extract_js_swfobject.js
===================================================================
--- trunk/src/lm_extract_js_swfobject.js 2011-07-14 10:52:59 UTC (rev
130)
+++ trunk/src/lm_extract_js_swfobject.js 2011-07-15 10:40:53 UTC (rev
131)
@@ -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] [131] Fix for SWFObject constructors.,
Ivaylo Valkov <=