roytam1
/
kmeleon
mirror of https://github.com/roytam1/kmeleon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

update flashblock to version in KM76RC Pro

master
roytam1 5 years ago
parent
a6049a3bd6
commit
3dcdc8420e
3 changed files with 77 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 93
      k-meleon/components/flashblock/flashblock.xml
  2. 2
      k-meleon/components/flashblock/version.dtd
  3. 5
      k-meleon/components/flashblock/videoblock.xml

93
k-meleon/components/flashblock/flashblock.xml
Unescape View File

@ -5,18 +5,34 @@
xmlns:html="http://www.w3.org/1999/xhtml"
>
<binding id="flash">
<binding id="flash"
bindToUntrustedContent="true">
<implementation>
<constructor>
<![CDATA[
//From Jesse's XPCNativeWrapper: http://mavra.perilith.com/~luser/content/native.js
function nativeMethod(untrustedObject, methodName)
{
// happier stack traces and faster multiple calls
var fun = Components.lookupMethod(untrustedObject, methodName);
return function()
{
return fun.apply(untrustedObject, arguments);
}
}
function flashblockCreatePlaceholder(isStandalone) {
// Create placeholder
var flashblockCreateElement;
var placeholder;
placeholder = document.createElementNS( "http://www.w3.org/1999/xhtml", "div");
try {
flashblockCreateElement = nativeMethod(document, "createElementNS");
placeholder = flashblockCreateElement("http://www.w3.org/1999/xhtml", "div");
} catch (e) {
placeholder = document.createElementNS( "http://www.w3.org/1999/xhtml", "div");
}
placeholder.isStandalone = isStandalone;
return placeholder;
}
@ -95,13 +111,14 @@ function flashblockIsWhitelisted(node, type) {
// thought of it on my own. :-)
// Lor 20041215: Use "UIEvents" to make it work in post-1.0 FF
// (thanks to Neil again)
// bz says QI is a no-op.
document.QueryInterface(Components.interfaces.nsIDOMDocument);
var flashblockEvent = document.createEvent("UIEvents");
if(flashblockEvent) {
var evt = type == "silverlight" ? "silverblockCheckLoad" : "flashblockCheckLoad";
flashblockEvent.initEvent(evt, true, true);
node.dispatchEvent(flashblockEvent);
if(flashblockEvent.getPreventDefault() == true) {
if(flashblockEvent.defaultPrevented || node.hasAttribute("data-flashblockWhitelisted")) {
// Whitelisted
return true;
}
@ -280,8 +297,13 @@ flashblockStylePlaceholder(current, placeholder, isStandalone);
flashblockSetTitle(current, placeholder, isStandalone);
// Replace the flash document with a placeholder.
window.setTimeout(flashblockShowPlaceholder, 0);
try {
var flashblockSetTimeout = nativeMethod(window, "setTimeout");
flashblockSetTimeout(flashblockShowPlaceholder, 0);
}
catch (e) {
window.setTimeout(flashblockShowPlaceholder, 0);
}
// Change the placeholder background when the mouse enters/exits the div.
placeholder.addEventListener("mouseover",
@ -310,25 +332,29 @@ placeholder.addEventListener("keypress", flashblockShowFlash, "false");
</implementation>
</binding>
<binding id="director" extends="#flash">
<binding id="director" extends="#flash"
bindToUntrustedContent="true">
<implementation>
<field name="flashblockType">"director"</field>
</implementation>
</binding>
<binding id="authorware" extends="#flash">
<binding id="authorware" extends="#flash"
bindToUntrustedContent="true">
<implementation>
<field name="flashblockType">"authorware"</field>
</implementation>
</binding>
<binding id="silverlight" extends="#flash">
<binding id="silverlight" extends="#flash"
bindToUntrustedContent="true">
<implementation>
<field name="flashblockType">"silverlight"</field>
</implementation>
</binding>
<binding id="brokenobject">
<binding id="brokenobject"
bindToUntrustedContent="true">
<implementation>
<field name="brokenObject">"yes"</field>
@ -336,18 +362,34 @@ placeholder.addEventListener("keypress", flashblockShowFlash, "false");
<constructor>
<![CDATA[
//From Jesse's XPCNativeWrapper: http://mavra.perilith.com/~luser/content/native.js
function nativeMethod(untrustedObject, methodName)
{
// happier stack traces and faster multiple calls
var fun = Components.lookupMethod(untrustedObject, methodName);
return function()
{
return fun.apply(untrustedObject, arguments);
}
}
function flashblockCreatePlaceholder(isStandalone) {
// Create placeholder
var flashblockCreateElement;
var placeholder;
placeholder = document.createElementNS( "http://www.w3.org/1999/xhtml", "div");
try {
flashblockCreateElement = nativeMethod(document, "createElementNS");
placeholder = flashblockCreateElement("http://www.w3.org/1999/xhtml", "div");
} catch (e) {
placeholder = document.createElementNS( "http://www.w3.org/1999/xhtml", "div");
}
placeholder.isStandalone = isStandalone;
return placeholder;
}
// Substitute the animation with a placeholder
function flashblockShowPlaceholder() {
function flashblockShowPlaceholder(placeholder, current, parent) {
// Just in case the object has been moved away from under our feet during
// the timeout, re-assign the parent node. See bug 13680
// parent = current.parentNode;
@ -420,13 +462,15 @@ function flashblockIsWhitelisted(node, type) {
// thought of it on my own. :-)
// Lor 20041215: Use "UIEvents" to make it work in post-1.0 FF
// (thanks to Neil again)
// bz says QI is a no-op.
document.QueryInterface(Components.interfaces.nsIDOMDocument);
var flashblockEvent = document.createEvent("UIEvents");
if(flashblockEvent) {
var evt = type == "silverlight" ? "silverblockCheckLoad" : "flashblockCheckLoad";
flashblockEvent.initEvent(evt, true, true);
node.dispatchEvent(flashblockEvent);
if(flashblockEvent.getPreventDefault() == true) {
node.ownerDocument.defaultView.console.log(node.ownerDocument.URL + " ==> " + flashblockEvent.defaultPrevented);
if(flashblockEvent.defaultPrevented || node.hasAttribute("data-flashblockWhitelisted")) {
// Whitelisted
return true;
}
@ -630,8 +674,13 @@ flashblockStylePlaceholder(current, placeholder, isStandalone);
flashblockSetTitle(current, placeholder, isStandalone);
// Replace the flash document with a placeholder.
window.setTimeout(flashblockShowPlaceholder, 0, placeholder, current, parent);
try {
var flashblockSetTimeout = nativeMethod(window, "setTimeout");
flashblockSetTimeout(flashblockShowPlaceholder, 0, placeholder, current, parent);
}
catch (e) {
window.setTimeout(flashblockShowPlaceholder, 0, placeholder, current, parent);
}
// Change the placeholder background when the mouse enters/exits the div.
placeholder.addEventListener("mouseover",
@ -660,18 +709,20 @@ placeholder.addEventListener("keypress", flashblockShowFlash, "false");
</implementation>
</binding>
<binding id="sifr-replaced">
<binding id="sifr-replaced"
bindToUntrustedContent="true">
<implementation>
<constructor>
<![CDATA[
// bz says QI is a no-op.
document.QueryInterface(Components.interfaces.nsIDOMDocument);
event = document.createEvent("UIEvents");
if(event) {
event.initEvent("flashblockCheckLoad", true, true);
this.dispatchEvent(event);
if(event.getPreventDefault() == true) {
if(event.defaultPrevented || this.hasAttribute("data-flashblockWhitelisted")) {
// Whitelisted
return;
}
@ -687,18 +738,20 @@ this.style.overflow ="hidden";
</implementation>
</binding>
<binding id="sifr-alternate">
<binding id="sifr-alternate"
bindToUntrustedContent="true">
<implementation>
<constructor>
<![CDATA[
// bz says QI is a no-op.
document.QueryInterface(Components.interfaces.nsIDOMDocument);
var event = document.createEvent("UIEvents");
if(event) {
event.initEvent("flashblockCheckLoad", true, true);
this.dispatchEvent(event);
if(event.getPreventDefault() == true) {
if(event.defaultPrevented || this.hasAttribute("data-flashblockWhitelisted")) {
// Whitelisted
return;
}

2
k-meleon/components/flashblock/version.dtd
Unescape View File

@ -1 +1 @@
<!ENTITY extension.version "1.5.17">
<!ENTITY extension.version "1.5.20">

5
k-meleon/components/flashblock/videoblock.xml
Unescape View File

@ -5,7 +5,8 @@
xmlns:html="http://www.w3.org/1999/xhtml"
>
<binding id="html5video">
<binding id="html5video"
bindToUntrustedContent="true">
<implementation>
<constructor>
<![CDATA[
@ -89,7 +90,7 @@ function flashblockIsWhitelisted(node) {
var evt = "HTML5VideoCheckLoad";
flashblockEvent.initEvent(evt, true, true);
node.dispatchEvent(flashblockEvent);
if(flashblockEvent.getPreventDefault())
if(flashblockEvent.defaultPrevented || node.hasAttribute("data-flashblockWhitelisted"))
return true; // Whitelisted
}
return false;

Write Preview
Loading…
Cancel
Save