Merge pull request #1 from ajaxorg/master

updates

Author: bmatusiak

core/baseclasses/basetree.js

@@ -744,7 +744,8 @@ apf.BaseTree = function(){
             pContainer    = htmlNode.parentNode;
 
         //Remove htmlNodes from tree
-        containerNode.parentNode.removeChild(containerNode);
+        if (containerNode)
+            containerNode.parentNode.removeChild(containerNode);
         pContainer.removeChild(htmlNode);
 
         //Datagrid??

core/class.js

@@ -945,7 +945,7 @@ apf.Class.prototype = new (function(){
             //Remove id from global js space
             try {
                 if (this.id || this.name)
-                    self[this.id || this.name] = null;
+                    delete self[this.id || this.name];
             }
             catch (ex) {}
             return;

core/lib/xmldb.js

@@ -536,7 +536,7 @@ apf.xmldb = new (function(){
 
         // @todo: only do this once! - should store on the undo object
         if (oldNode.ownerDocument.importNode && newNode.ownerDocument != oldNode.ownerDocument) {
-            var oldNodeS = xmlNode;
+            var oldNodeS = newNode;
             newNode = oldNode.ownerDocument.importNode(newNode, true); //Safari issue not auto importing nodes
             if (oldNodeS.parentNode)
                 oldNodeS.parentNode.removeChild(oldNodeS);

core/markup/aml/element.js

@@ -479,8 +479,12 @@ apf.AmlElement = function(struct, tagName){
         if (options && options.clear)
             include.setAttribute("clear", true);
         include.options  = options;
-        include.callback = options && options.callback || function(){
+        include.callback = function(){
             _self.dispatchEvent("afteramlinserted", {src: amlDefNode});
+            options && options.callback && options.callback();
+            setTimeout(function(){
+                include.destroy(true, true);
+            });
         };
         this.appendChild(include);
     };

elements/skin.js

@@ -78,7 +78,7 @@ apf.aml.setElement("skin", apf.skin);
     }
 
     this.$propHandlers["name"] = function(value){
-        if (!this.attributes.getNamedItem("src")) {
+        if (!this.src && !this.attributes.getNamedItem("src")) {
             this.$path = apf.getAbsolutePath(apf.hostPath, value) + "/index.xml";
             getSkin.call(this, this.$path);
         }
@@ -289,4 +289,4 @@ apf.aml.setElement("skin", apf.skin);
     });
 }).call(apf.skin.prototype = new apf.AmlElement());
 
-// #endif
+// #endif