[FIX] ClickToFlash could mistakenly replace non-Flash elements which …

…use the <object> element
mattball · Jun 25, 2010 · 55fe64a · 55fe64a
1 parent 790bfcb
commit 55fe64a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/ClickToFlash.safariextension/ClickToFlash.js b/ClickToFlash.safariextension/ClickToFlash.js
@@ -27,6 +27,17 @@ ClickToFlash.prototype.handleBeforeLoadEvent = function(event) {
 	if (element instanceof HTMLEmbedElement || element instanceof HTMLObjectElement) {
 		if (element.allowedToLoad)
 			return;
+
+		if (element instanceof HTMLObjectElement) {
+			var type = element.getAttribute("type");
+			if (!type) {
+				return;
+			}
+
+			if (!type.match("application/x-shockwave-flash") && !type.match("application/futuresplash")) {
+				return;
+			}
+		}
 
 		this.settings = safari.self.tab.canLoad(event, "getSettings");
 		this.settings["whitelist"] = this.settings["whitelist"].split(",");