[Pkg-javascript-commits] [dojo] 23/88: Check ioArgs when adding dead scripts (1.8 backport). refs #15890 !strict

[David Prévot]

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

taffit pushed a commit to annotated tag 1.8.5
in repository dojo.

commit 0e89b517e922f71aad1b31f3bef1eab9b4eafb34
Author: Bryan Forbes <bryan at reigndropsfall.net>
Date:   Wed Sep 26 17:51:25 2012 +0000

    Check ioArgs when adding dead scripts (1.8 backport). refs #15890 !strict
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.8/dojo@29707 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 request/script.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/request/script.js b/request/script.js
index cb0ae72..bff59c2 100644
--- a/request/script.js
+++ b/request/script.js
@@ -56,9 +56,17 @@ define([
 	}
 
 	function _addDeadScript(dfd){
-		var response = dfd.response;
-		deadScripts.push({ id: dfd.id, frameDoc: response.options.frameDoc });
-		response.options.frameDoc = null;
+		// Be sure to check ioArgs because it can dynamically change in the dojox/io plugins.
+		// See http://bugs.dojotoolkit.org/ticket/15890.
+		var options = dfd.response.options,
+			frameDoc = options.ioArgs ? options.ioArgs.frameDoc : options.frameDoc;
+
+		deadScripts.push({ id: dfd.id, frameDoc: frameDoc });
+
+		if(options.ioArgs){
+			options.ioArgs.frameDoc = null;
+		}
+		options.frameDoc = null;
 	}
 
 	function canceler(dfd, response){

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