Fix new node not removed correctly. Do not set node selected if curre…

…nt context is not its parent.
pydio · Oct 7, 2013 · ae1dde8 · ae1dde8
1 parent 7f6fc83
commit ae1dde8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActionsManager.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActionsManager.js
@@ -458,7 +458,9 @@ Class.create("ActionsManager", {
                         if(!parent && getRepName(newNode.getPath()) == "") parent = dm.getRootNode();
                         if(parent){
                             parent.addChild(newNode);
-                            dm.setSelectedNodes([newNode], {});
+                            if(dm.getContextNode() == parent){
+                                dm.setSelectedNodes([newNode], {});
+                            }
                         }
                     });
                 }

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -1162,7 +1162,9 @@ Class.create("FilesList", SelectableElements, {
                 item.ajxpNode = null;
                 delete item;
                 newItem.REPLACE_OBS = this.makeItemRefreshObserver(ajxpNode, newItem, renderer);
+                newItem.REMOVE_OBS = this.makeItemRemovedObserver(ajxpNode, newItem);
                 ajxpNode.observe("node_replaced", newItem.REPLACE_OBS);
+                ajxpNode.observe("node_removed", newItem.REMOVE_OBS);
                 var dm = (this._dataModel?this._dataModel:ajaxplorer.getContextHolder());
                 if(dm.getSelectedNodes() && dm.getSelectedNodes().length)
                 {