[Pkg-javascript-commits] [dojo] 06/09: 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.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.0.0rc3
in repository dojo.

commit 78e22333051fe1603b5107ddb139f94b2ebb70e3
Author: James Burke <jrburke at gmail.com>
Date:   Thu Nov 15 04:49:07 2007 +0000

    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
---
 _firebug/firebug.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/_firebug/firebug.js b/_firebug/firebug.js
index e8390b2..0b34471 100644
--- a/_firebug/firebug.js
+++ b/_firebug/firebug.js
@@ -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(){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git