[or-cvs] [torbutton/master 08/30] Bug 1283: Disable the fix. Too much collateral damage..

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Mon, 22 Mar 2010 16:42:34 -0700
Subject: Bug 1283: Disable the fix. Too much collateral damage..
Commit: ede018b3bb30eb717bce07eb98416f1e4cc7c082

We need to work on better UI to explain to users why their browser
appears dead. And we need to make it a little less dead, too.
---
 src/chrome/content/torbutton.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 4b8086a..ce7f4da 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2078,6 +2078,9 @@ function torbutton_check_js_tag(browser, tor_enabled, js_enabled) {
     }
 
     /* Solution from: https://bugzilla.mozilla.org/show_bug.cgi?id=409737 */
+    // XXX: This is disabled. It kills the entire window. We need to redirect
+    // focus and inform the user via a lightbox.
+    // See https://bugs.torproject.org/flyspray/index.php?do=details&id=1283
     try {
         if (!browser.contentWindow)
             torbutton_log(3, "No content window to disable JS events.");
@@ -2085,6 +2088,7 @@ function torbutton_check_js_tag(browser, tor_enabled, js_enabled) {
             eventSuppressor = browser.contentWindow.
                 QueryInterface(Components.interfaces.nsIInterfaceRequestor).
                        getInterface(Ci.nsIDOMWindowUtils);
+        eventSuppressor = null;
     } catch(e) {
         torbutton_log(4, "Failed to disable JS events: "+e)
     }
-- 
1.6.5