Merge pull request #32219 from nextcloud/backport/32218/stable24

[stable24] Revert "Show the child folders in the breadcrumb menu when on a parent entry."

2 files changed, 5 insertions, 24 deletions

diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js
index 8a5d42bd975..383d3debd09 100644
--- a/apps/files/js/breadcrumb.js
+++ b/apps/files/js/breadcrumb.js
@@ -58,9 +58,7 @@
 	BreadCrumb.prototype = {
 		$el: null,
 		dir: null,
-		maxDepthDir: null,
 		dirInfo: null,
-		activeItemIndex: 0,
 
 		/**
 		 * Total width of all breadcrumbs
@@ -83,9 +81,6 @@
 			dir = dir.replace(/\\/g, '/');
 			dir = dir || '/';
 			if (dir !== this.dir) {
-				if ((this.maxDepthDir || "").search(dir) !== 0) {
-					this.maxDepthDir = dir;
-				}
 				this.dir = dir;
 				this.render();
 			}
@@ -123,7 +118,7 @@
 			// Menu is destroyed on every change, we need to init it
 			OC.unregisterMenu($('.crumbmenu > .icon-more'), $('.crumbmenu > .popovermenu'));
 
-			var parts = this._makeCrumbs(this.maxDepthDir || '/');
+			var parts = this._makeCrumbs(this.dir || '/');
 			var $crumb;
 			var $menuItem;
 			this.$el.empty();
@@ -168,7 +163,7 @@
 				if(menuPart.dir) {
 					$menuItem = $('<li class="crumblist"><a><span class="icon-folder"></span><span></span></a></li>');
 					$menuItem.data('dir', menuPart.dir);
-					$menuItem.find('a').attr('href', this.getCrumbUrl(menuPart, j));
+					$menuItem.find('a').attr('href', this.getCrumbUrl(part, j));
 					$menuItem.find('span:eq(1)').text(menuPart.name);
 					this.$menu.children('ul').append($menuItem);
 					if (this.onClick) {
@@ -176,16 +171,11 @@
 					}
 				}
 			}
-
 			_.each(this._detailViews, function(view) {
 				view.render({
 					dirInfo: this.dirInfo
 				});
-
-				if (this.breadcrumbs.length > 2) {
-					this.breadcrumbs[this.activeItemIndex + 2].append(view.$el);
-				}
-
+				$crumb.append(view.$el);
 				$menuItem.append(view.$el.clone(true));
 			}, this);
 
@@ -238,15 +228,8 @@
 			for (var i = 0; i < parts.length; i++) {
 				var part = parts[i];
 				pathToHere = pathToHere + '/' + part;
-
-				let classes = "";
-				if (pathToHere === this.dir) {
-					this.activeItemIndex = i;
-					classes = "active";
-				}
 				crumbs.push({
 					dir: pathToHere,
-					class: classes,
 					name: part
 				});
 			}
diff --git a/apps/files/tests/js/breadcrumbSpec.js b/apps/files/tests/js/breadcrumbSpec.js
index b83ec78be7b..820b0f70569 100644
--- a/apps/files/tests/js/breadcrumbSpec.js
+++ b/apps/files/tests/js/breadcrumbSpec.js
@@ -56,15 +56,13 @@ describe('OCA.Files.BreadCrumb tests', function() {
 			expect($crumbs.eq(1).find('a').hasClass('icon-home')).toEqual(true);
 			expect($crumbs.eq(1).data('dir')).toEqual('/');
 		});
-		it('Renders complete directory when switching to root', function() {
+		it('Renders root when switching to root', function() {
 			var $crumbs;
 			bc.setDirectory('/somedir');
 			bc.setDirectory('/');
 			$crumbs = bc.$el.find('.crumb');
-			expect($crumbs.length).toEqual(3);
+			expect($crumbs.length).toEqual(2);
 			expect($crumbs.eq(1).data('dir')).toEqual('/');
-			expect($crumbs.eq(2).data('dir')).toEqual('/somedir');
-			expect($crumbs.eq(2).attr('class').includes("active")).toEqual(false);
 		});
 		it('Renders single path section', function() {
 			var $crumbs;