Fix selectAll() action in GUI - was breaking the recycle bin empty ac…

…tion.
pydio · Oct 5, 2015 · be82a25 · be82a25
1 parent cd6abec
commit be82a25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/core/model/PydioDataModel.js b/core/src/plugins/gui.ajax/res/js/core/model/PydioDataModel.js
@@ -466,6 +466,7 @@ var PydioDataModel = (function (_Observable) {
 		this._selectedNodes = ajxpDataNodes;
 		this._bEmpty = ajxpDataNodes && ajxpDataNodes.length ? false : true;
 		this._bFile = this._bDir = this._isRecycle = false;
+		this._bUnique = false;
 		if (!this._bEmpty) {
 			this._bUnique = ajxpDataNodes.length == 1;
 			for (var i = 0; i < ajxpDataNodes.length; i++) {
@@ -517,7 +518,12 @@ var PydioDataModel = (function (_Observable) {
   */
 
 	PydioDataModel.prototype.selectAll = function selectAll() {
-		this.setSelectedNodes(this._contextNode.getChildren(), "dataModel");
+		var nodes = [];
+		var childrenMap = this._contextNode.getChildren();
+		childrenMap.forEach(function (child) {
+			nodes.push(child);
+		});
+		this.setSelectedNodes(nodes, "dataModel");
 	};
 
 	/**

diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/PydioDataModel.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/PydioDataModel.es6
@@ -436,6 +436,7 @@ class PydioDataModel extends Observable{
 		this._selectedNodes = ajxpDataNodes;
 		this._bEmpty = ((ajxpDataNodes && ajxpDataNodes.length)?false:true);
 		this._bFile = this._bDir = this._isRecycle = false;
+        this._bUnique = false;
 		if(!this._bEmpty)
 		{
 			this._bUnique = (ajxpDataNodes.length == 1);
@@ -485,7 +486,10 @@ class PydioDataModel extends Observable{
 	 * Select all the children of the current context node
 	 */
 	selectAll (){
-		this.setSelectedNodes(this._contextNode.getChildren(), "dataModel");
+        var nodes = [];
+        var childrenMap = this._contextNode.getChildren();
+        childrenMap.forEach(function(child){nodes.push(child)});
+		this.setSelectedNodes(nodes, "dataModel");
 	}
 
 	/**