Ticket #1958: dojo0.3.1_ContentPaneCssUnloadFix.diff

src/widget/html/ContentPane.js

@@ -130 +130 @@
                 this._runStack("_onUnLoadStack");
                 this.scriptScope = null;
+                
+                // remove old children from current content
+                this.destroyChildren();
+
+                // remove old stylenodes from HEAD
+                if(this._remoteStyles){
+                        for(var i = 0; i < this._remoteStyles.length; i++){
+                                if(this._remoteStyles[i] && this._remoteStyles[i].parentNode){
+                                        this._remoteStyles[i].parentNode.removeChild(this._remoteStyles[i]);
+                                }
+                        }
+                        this._remoteStyles = null;
+                }
         },
 
@@ -396 +409 @@
                 //              private internal function without path regExpCheck and no onLoad calls aftervards
 
-                // remove old children from current content
-                this.destroyChildren();
-
-                // remove old stylenodes from HEAD
-                if(this._remoteStyles){
-                        for(var i = 0; i < this._remoteStyles.length; i++){
-                                if(this._remoteStyles[i] && this._remoteStyles.parentNode){
-                                        this._remoteStyles[i].parentNode.removeChild(this._remoteStyles[i]);
-                                }
-                        }
-                        this._remoteStyles = null;
-                }
-
                 var node = this.containerNode || this.domNode;
                 try{