commit 0b96be3008ff894bf1e04dbf96103da78b601013 Author: Mike Perry <mikeperry-git@fscked.org> Date: Wed Feb 23 22:58:23 2011 -0800 Bug #2465: Fix Javascript hooks+exception on FF4.0b11 The javascript hooks work again, and we've removed a nasty popup exception on FF4.0b11 too. --- src/chrome/content/jshooks.js | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/jshooks.js b/src/chrome/content/jshooks.js index b856922..32c446d 100644 --- a/src/chrome/content/jshooks.js +++ b/src/chrome/content/jshooks.js @@ -3,6 +3,7 @@ window.__HookObjects = function() { return false; } + /* For reference/debugging only: if(false && window.__tb_set_uagent===true) { var tmp_oscpu = window.__tb_oscpu; @@ -326,11 +327,14 @@ window.__HookObjects = function() { // to be a 'Window' but is not the same class as 'window'...) and // hide XPCNativeWrapper there. // This seems no longer necessary in FF2.0.0.13+, and may break FF3? - with(window.valueOf.call().__proto__) { - XPCNativeWrapper = function(a) { return a; }; - } - - window.__proto__ = null; // Prevent delete from unmasking our properties. + //with(window.valueOf.call().__proto__) { + // XPCNativeWrapper = function(a) { return a; }; + //} + + // FIXME: Commenting this may open us to unmasking, but allows the hooks to + // work on FF4. Since we lost the bulletproof resolution masking battle to + // CSS3 anyways, let's just do what we can. + //window.__proto__ = null; // Prevent delete from unmasking our properties. return true; }