Commit 78e22333 authored by James Burke's avatar James Burke

Fixes #5131. Make sure if trying to access parent frame, catch any exceptions...

Fixes #5131. Make sure if trying to access parent frame, catch any exceptions and eat them. This is important if the iframe is on a different domain than the parent frame.

git-svn-id: http://svn.dojotoolkit.org/src/branches/1.0/dojo/trunk@11526 560b804f-0ae3-0310-86f3-f6aa0a117693
parent 23ac9489
......@@ -69,13 +69,15 @@ if(
){
(function(){
// don't build a firebug frame in iframes
if(window != window.parent){
// but if we've got a parent logger, connect to it
if(window.parent["console"]){
window.console = window.parent.console;
try{
if(window != window.parent){
// but if we've got a parent logger, connect to it
if(window.parent["console"]){
window.console = window.parent.console;
}
return;
}
return;
}
}catch(e){}
window.console = {
log: function(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment