Changeset 753 for trunk

Show
Ignore:
Timestamp:
09/11/08 09:29:46 (3 months ago)
Author:
oyasu..@gmail.com
Message:

Applying another patch by sevenfurnace@gmail.com that fixes #122 again, without eval and in Firefox 3.0.2 onward -- thanks!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/components/greasemonkey.js

    r752 r753  
    401401        return null; 
    402402      } 
    403       var handler = eval("FirebugConsoleHandler", 
    404                          chromeWin.Firebug.Console.injector.attachConsole); 
    405       firebugConsole = new handler(firebugContext, unsafeContentWin); 
     403      var safeWin = new XPCNativeWrapper(unsafeContentWin); 
     404      if (firebugContext.consoleHandler) { 
     405        for (var i = 0; i < firebugContext.consoleHandler.length; i++) { 
     406          if (firebugContext.consoleHandler[i].window == safeWin) { 
     407            return firebugContext.consoleHandler[i].handler; 
     408          } 
     409        } 
     410      } 
     411      var dummyElm = safeWin.document.createElement("div"); 
     412      dummyElm.setAttribute("id", "_firebugConsole"); 
     413      safeWin.document.documentElement.appendChild(dummyElm); 
     414      chromeWin.Firebug.Console.injector.addConsoleListener(firebugContext, safeWin); 
     415      dummyElm.parentNode.removeChild(dummyElm); 
     416      firebugConsole = firebugContext.consoleHandler.pop().handler; 
    406417    } 
    407418    return firebugConsole;