upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
[stable24] Revert "Show the child folders in the breadcrumb menu when on a parent entry."
This commit is contained in:
Simon L 2022-05-04 10:16:23 +02:00 committed by GitHub
commit 602f44954f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/files/js/breadcrumb.js
View file

@ -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
});
}

6
apps/files/tests/js/breadcrumbSpec.js
View file

@ -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;

15
core/css/styles.scss
View file

@ -1181,13 +1181,6 @@ div.crumb {
order: 3;
}
}
&.active {
font-weight: bold;
// Allow multiple span next to the main 'a'
a ~ span {
padding-left: 0;
}
}
> a,
> span {
position: relative;
@ -1212,6 +1205,14 @@ div.crumb {
}
&:not(:first-child) a {
}
&:last-child {
font-weight: bold;
margin-right: 10px;
// Allow multiple span next to the main 'a'
a ~ span {
padding-left: 0;
}
}
&:hover, &:focus, a:focus, &:active {
opacity: 1;