[or-cvs] r12056: Fix a double-js hook error popup when dealing with iframes+b (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2007-10-20 01:18:11 -0400 (Sat, 20 Oct 2007)
New Revision: 12056

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
Log:

Fix a double-js hook error popup when dealing with 
iframes+back/fwd.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-10-19 20:48:46 UTC (rev 12055)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-10-20 05:18:11 UTC (rev 12056)
@@ -1019,8 +1019,10 @@
     }
 
     if(win != win.top) {
+        // Handle the iframe case
         torbutton_log(3, "Hook for non-toplevel window: "+doc.location);
         win = win.top;
+        doc = win.document;
     }
 
     if(typeof(win.wrappedJSObject) == 'undefined') {