From 976c007ff3c3a83d66e970c6bad48437e0b749ff Mon Sep 17 00:00:00 2001 From: jerome mouneyrac Date: Mon, 7 Dec 2009 03:24:49 +0000 Subject: [PATCH] flash upgrader MDL-20841 fix swfobject javascript bug related to http://code.google.com/p/swfobject/issues/detail?id=332, merged from 1.9 --- lib/swfobject/swfobject.js | 127 +++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 60 deletions(-) diff --git a/lib/swfobject/swfobject.js b/lib/swfobject/swfobject.js index 9378c8f756..17481e40c9 100644 --- a/lib/swfobject/swfobject.js +++ b/lib/swfobject/swfobject.js @@ -1,9 +1,11 @@ -/*! SWFObject v2.2 - is released under the MIT License +//one change has been done related to http://code.google.com/p/swfobject/issues/detail?id=332 +//we added lines: 204, 205, 207, 208, 209 (try-catch) +/*! SWFObject v2.2 + is released under the MIT License */ var swfobject = function() { - + var UNDEF = "undefined", OBJECT = "object", SHOCKWAVE_FLASH = "Shockwave Flash", @@ -11,11 +13,11 @@ var swfobject = function() { FLASH_MIME_TYPE = "application/x-shockwave-flash", EXPRESS_INSTALL_ID = "SWFObjectExprInst", ON_READY_STATE_CHANGE = "onreadystatechange", - + win = window, doc = document, nav = navigator, - + plugin = false, domLoadFnArr = [main], regObjArr = [], @@ -30,11 +32,11 @@ var swfobject = function() { dynamicStylesheet, dynamicStylesheetMedia, autoHideShow = true, - + /* Centralized function for browser feature detection - User agent string detection is only used when no good alternative is possible - Is executed directly for optimal performance - */ + */ ua = function() { var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF, u = nav.userAgent.toLowerCase(), @@ -72,21 +74,21 @@ var swfobject = function() { } return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac }; }(), - + /* Cross-browser onDomLoad - Will fire an event as soon as the DOM of a web page is loaded - Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/ - Regular onload serves as fallback - */ + */ onDomLoad = function() { if (!ua.w3) { return; } - if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically + if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically callDomLoadFunctions(); } if (!isDomLoaded) { if (typeof doc.addEventListener != UNDEF) { doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false); - } + } if (ua.ie && ua.win) { doc.attachEvent(ON_READY_STATE_CHANGE, function() { if (doc.readyState == "complete") { @@ -121,7 +123,7 @@ var swfobject = function() { addLoadEvent(callDomLoadFunctions); } }(); - + function callDomLoadFunctions() { if (isDomLoaded) { return; } try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early @@ -135,19 +137,19 @@ var swfobject = function() { domLoadFnArr[i](); } } - + function addDomLoadEvent(fn) { if (isDomLoaded) { fn(); } - else { + else { domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+ } } - + /* Cross-browser onload - Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/ - - Will fire an event as soon as a web page including all of its assets are loaded + - Will fire an event as soon as a web page including all of its assets are loaded */ function addLoadEvent(fn) { if (typeof win.addEventListener != UNDEF) { @@ -170,11 +172,11 @@ var swfobject = function() { win.onload = fn; } } - + /* Main function - Will preferably execute onDomLoad, otherwise onload (as a fallback) */ - function main() { + function main() { if (plugin) { testPlayerVersion(); } @@ -182,7 +184,7 @@ var swfobject = function() { matchVersions(); } } - + /* Detect the Flash Player version for non-Internet Explorer browsers - Detecting the plug-in version via the object element is more precise than using the plugins collection item's description: a. Both release and build numbers can be detected @@ -199,7 +201,12 @@ var swfobject = function() { var counter = 0; (function(){ if (typeof t.GetVariable != UNDEF) { + try + { var d = t.GetVariable("$version"); + } catch(err) { + //Handle errors here + } if (d) { d = d.split(" ")[1].split(","); ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)]; @@ -219,7 +226,7 @@ var swfobject = function() { matchVersions(); } } - + /* Perform Flash Player and SWF version matching; static publishing only */ function matchVersions() { @@ -268,7 +275,7 @@ var swfobject = function() { setVisibility(id, true); if (cb) { var o = getObjectById(id); // test whether there is an HTML object element or not - if (o && typeof o.SetVariable != UNDEF) { + if (o && typeof o.SetVariable != UNDEF) { cbObj.success = true; cbObj.ref = o; } @@ -278,7 +285,7 @@ var swfobject = function() { } } } - + function getObjectById(objectIdStr) { var r = null; var o = getElementById(objectIdStr); @@ -295,7 +302,7 @@ var swfobject = function() { } return r; } - + /* Requirements for Adobe Express Install - only one instance can be active at a time - fp 6.0.65 or higher @@ -305,7 +312,7 @@ var swfobject = function() { function canExpressInstall() { return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312); } - + /* Show the Adobe Express Install dialog - Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75 */ @@ -355,7 +362,7 @@ var swfobject = function() { createSWF(att, par, replaceElemIdStr); } } - + /* Functions to abstract and display alternative content */ function displayAltContent(obj) { @@ -378,7 +385,7 @@ var swfobject = function() { else { obj.parentNode.replaceChild(abstractAltContent(obj), obj); } - } + } function abstractAltContent(obj) { var ac = createElement("div"); @@ -401,7 +408,7 @@ var swfobject = function() { } return ac; } - + /* Cross-browser dynamic SWF creation */ function createSWF(attObj, parObj, id) { @@ -434,7 +441,7 @@ var swfobject = function() { } el.outerHTML = '' + par + ''; objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only) - r = getElementById(attObj.id); + r = getElementById(attObj.id); } else { // well-behaving browsers var o = createElement(OBJECT); @@ -460,14 +467,14 @@ var swfobject = function() { } return r; } - + function createObjParam(el, pName, pValue) { var p = createElement("param"); - p.setAttribute("name", pName); + p.setAttribute("name", pName); p.setAttribute("value", pValue); el.appendChild(p); } - + /* Cross-browser SWF removal - Especially needed to safely and completely remove a SWF in Internet Explorer */ @@ -490,7 +497,7 @@ var swfobject = function() { } } } - + function removeObjectInIE(id) { var obj = getElementById(id); if (obj) { @@ -502,7 +509,7 @@ var swfobject = function() { obj.parentNode.removeChild(obj); } } - + /* Functions to optimize JavaScript compression */ function getElementById(id) { @@ -513,19 +520,19 @@ var swfobject = function() { catch (e) {} return el; } - + function createElement(el) { return doc.createElement(el); } - + /* Updated attachEvent function for Internet Explorer - Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks - */ + */ function addListener(target, eventType, fn) { target.attachEvent(eventType, fn); listenersArr[listenersArr.length] = [target, eventType, fn]; } - + /* Flash Player and SWF content version matching */ function hasPlayerVersion(rv) { @@ -535,10 +542,10 @@ var swfobject = function() { v[2] = parseInt(v[2], 10) || 0; return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false; } - + /* Cross-browser dynamic CSS creation - Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php - */ + */ function createCSS(sel, decl, media, newStyle) { if (ua.ie && ua.mac) { return; } var h = doc.getElementsByTagName("head")[0]; @@ -548,7 +555,7 @@ var swfobject = function() { dynamicStylesheet = null; dynamicStylesheetMedia = null; } - if (!dynamicStylesheet || dynamicStylesheetMedia != m) { + if (!dynamicStylesheet || dynamicStylesheetMedia != m) { // create dynamic stylesheet + get a global reference to it var s = createElement("style"); s.setAttribute("type", "text/css"); @@ -571,7 +578,7 @@ var swfobject = function() { } } } - + function setVisibility(id, isVisible) { if (!autoHideShow) { return; } var v = isVisible ? "visible" : "hidden"; @@ -590,7 +597,7 @@ var swfobject = function() { var hasBadChars = regex.exec(s) != null; return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s; } - + /* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only) */ var cleanup = function() { @@ -618,11 +625,11 @@ var swfobject = function() { }); } }(); - + return { /* Public API - Reference: http://code.google.com/p/swfobject/wiki/documentation - */ + */ registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) { if (ua.w3 && objectIdStr && swfVersionStr) { var regObj = {}; @@ -637,13 +644,13 @@ var swfobject = function() { callbackFn({success:false, id:objectIdStr}); } }, - + getObjectById: function(objectIdStr) { if (ua.w3) { return getObjectById(objectIdStr); } }, - + embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) { var callbackObj = {success:false, id:replaceElemIdStr}; if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) { @@ -660,7 +667,7 @@ var swfobject = function() { att.data = swfUrlStr; att.width = widthStr; att.height = heightStr; - var par = {}; + var par = {}; if (parObj && typeof parObj === OBJECT) { for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs par[j] = parObj[j]; @@ -697,19 +704,19 @@ var swfobject = function() { } else if (callbackFn) { callbackFn(callbackObj); } }, - + switchOffAutoHideShow: function() { autoHideShow = false; }, - + ua: ua, - + getFlashPlayerVersion: function() { return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] }; }, - + hasFlashPlayerVersion: hasPlayerVersion, - + createSWF: function(attObj, parObj, replaceElemIdStr) { if (ua.w3) { return createSWF(attObj, parObj, replaceElemIdStr); @@ -718,29 +725,29 @@ var swfobject = function() { return undefined; } }, - + showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) { if (ua.w3 && canExpressInstall()) { showExpressInstall(att, par, replaceElemIdStr, callbackFn); } }, - + removeSWF: function(objElemIdStr) { if (ua.w3) { removeSWF(objElemIdStr); } }, - + createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) { if (ua.w3) { createCSS(selStr, declStr, mediaStr, newStyleBoolean); } }, - + addDomLoadEvent: addDomLoadEvent, - + addLoadEvent: addLoadEvent, - + getQueryParamValue: function(param) { var q = doc.location.search || doc.location.hash; if (q) { @@ -757,7 +764,7 @@ var swfobject = function() { } return ""; }, - + // For internal usage only expressInstallCallback: function() { if (isExpressInstallActive) { @@ -771,7 +778,7 @@ var swfobject = function() { if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); } } isExpressInstallActive = false; - } + } } }; }(); -- 2.39.5