bugfix #143: wrong position of "parent" item in case "folderPosition"…

… options is set to "top"
psolom · Apr 2, 2017 · 049c951 · 049c951
1 parent ecde8f4
commit 049c951
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -1437,7 +1437,7 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 				// add parent folder object
 				if(!isFile(model.currentPath()) && model.currentPath() !== fileRoot) {
 					var parentPath = getParentDirname(model.currentPath());
-					var parent = {
+					var parentItem = {
 						id: parentPath,
 						rdo: {
 							id: parentPath,
@@ -1450,21 +1450,21 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
                         dragHovered: ko.observable(false)
 					};
 
-					parent.open = function(item, e) {
+                    parentItem.open = function(item, e) {
                         if(isItemOpenable(e)) {
-                            items_model.loadList(parent.id);
+                            items_model.loadList(parentItem.id);
                         }
 					};
 
-                    parent.itemClass = ko.pureComputed(function() {
+                    parentItem.itemClass = ko.pureComputed(function() {
                         var cssClass = [];
-                        if (parent.dragHovered()) {
+                        if (parentItem.dragHovered()) {
                             cssClass.push(model.ddModel.hoveredCssClass);
                         }
                         return cssClass.join(' ');
                     });
 
-					objects.push(parent);
+					objects.push(parentItem);
 				}
 
                 // clear previously rendered content
@@ -2484,19 +2484,20 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 	 ---------------------------------------------------------*/
 
 	var sortItems = function(items) {
+		var parentItem;
 		var sortOrder = (fmModel.viewMode() === 'list') ? fmModel.itemsModel.listSortOrder() : configSortOrder;
 		var sortParams = {
 			natural: true,
 			order: sortOrder === 'asc' ? 1 : -1,
 			cases: false
 		};
 
-		items.sort(function(a, b) {
-            // commented to support IE sorting algorithm; parent item should be a first item
-            if(a.rdo.type === 'parent'/* || b.rdo.type === 'parent'*/) {
-                return -1;
-            }
+		// shift parent item to unshift it back after sorting
+		if (items[0].rdo.type === 'parent') {
+            parentItem = items.shift();
+		}
 
+		items.sort(function(a, b) {
 			var sortReturnNumber,
 				aa = getSortSubject(a),
 				bb = getSortSubject(b);
@@ -2615,6 +2616,11 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 				items.push(folderItems[k]);
 			}
 		}
+
+        if (parentItem) {
+            items.unshift(parentItem);
+		}
+
 		return items;
 	};