| 1 | Index: C:/workspace/dojo/_base/html.js
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- C:/workspace/dojo/_base/html.js (revision 3234)
|
|---|
| 4 | +++ C:/workspace/dojo/_base/html.js (working copy)
|
|---|
| 5 | @@ -81,8 +81,8 @@
|
|---|
| 6 |
|
|---|
| 7 | node = d.byId(node);
|
|---|
| 8 | try{
|
|---|
| 9 | - if(!_destroyContainer){
|
|---|
| 10 | - _destroyContainer = document.createElement("div");
|
|---|
| 11 | + if(!_destroyContainer || _destroyContainer.ownerDocument != node.ownerDocument){
|
|---|
| 12 | + _destroyContainer = node.ownerDocument.createElement("div");
|
|---|
| 13 | }
|
|---|
| 14 | _destroyContainer.appendChild(node.parentNode ? node.parentNode.removeChild(node) : node);
|
|---|
| 15 | // NOTE: see http://trac.dojotoolkit.org/ticket/2931. This may be a bug and not a feature
|
|---|
| 16 | @@ -264,9 +264,10 @@
|
|---|
| 17 | }
|
|---|
| 18 | =====*/
|
|---|
| 19 |
|
|---|
| 20 | - var gcs, dv = document.defaultView;
|
|---|
| 21 | + var gcs;
|
|---|
| 22 | if(d.isSafari){
|
|---|
| 23 | gcs = function(/*DomNode*/node){
|
|---|
| 24 | + var dv = node.ownerDocument.defaultView;
|
|---|
| 25 | var s = dv.getComputedStyle(node, null);
|
|---|
| 26 | if(!s && node.style){
|
|---|
| 27 | node.style.display = "";
|
|---|
| 28 | @@ -280,6 +281,7 @@
|
|---|
| 29 | };
|
|---|
| 30 | }else{
|
|---|
| 31 | gcs = function(node){
|
|---|
| 32 | + var dv = node.ownerDocument.defaultView;
|
|---|
| 33 | return dv.getComputedStyle(node, null);
|
|---|
| 34 | };
|
|---|
| 35 | }
|
|---|