Changeset 13951

Timestamp:

06/09/08 15:02:09 (6 months ago)

Author:

bill

Message:

Fixes for cross-window widget creation.
Make sure not to create a node in one document but then insert it into another.
(Always use dojo.withDoc.)
Otherwise, IE gets upset.
Fixes #6791.
Thanks Masato! (IBM, CCLA on file)
!strict

Files:

• dijit/trunk/tests/_base/test_CrossWindow.html (added)
• dijit/trunk/_Templated.js (modified) (2 diffs)
• dojo/trunk/_base/html.js (modified) (3 diffs)

dijit/trunk/_Templated.js

@@ -210 +210 @@
         var cached = tmplts[key];
         if(cached){
-                return cached;
+                if(!cached.ownerDocument || cached.ownerDocument == dojo.doc){
+                        // string or node of the same document
+                        return cached;
+                }
+                // destroy the old cached node of a different document
+                dojo._destroyElement(cached);
         }
 
@@ -274 +279 @@
                 //      Attempts to create a set of nodes based on the structure of the passed text.
 
+                if(tn && tn.ownerDocument != dojo.doc){
+                        // destroy dummy container of a different document
+                        dojo._destroyElement(tn);
+                        tn = undefined;
+                }
                 if(!tn){
                         tn = dojo.doc.createElement("div");

dojo/trunk/_base/html.js

@@ -82 +82 @@
                 node = d.byId(node);
                 try{
-                        if(!_destroyContainer){
-                                _destroyContainer = document.createElement("div");
+                        if(!_destroyContainer || _destroyContainer.ownerDocument != node.ownerDocument){
+                                _destroyContainer = node.ownerDocument.createElement("div");
                         }
                         _destroyContainer.appendChild(node.parentNode ? node.parentNode.removeChild(node) : node);
@@ -265 +265 @@
 =====*/
 
-        var gcs, dv = document.defaultView;
+        var gcs;
         if(d.isSafari){
                 gcs = function(/*DomNode*/node){
+                        var dv = node.ownerDocument.defaultView;
                         var s = dv.getComputedStyle(node, null);
                         if(!s && node.style){ 
@@ -281 +282 @@
         }else{
                 gcs = function(node){
+                        var dv = node.ownerDocument.defaultView;
                         return dv.getComputedStyle(node, null);
                 };