Skip to content

Some breadcrumb fixes #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oparoz wants to merge 4 commits into from
Closed

Some breadcrumb fixes #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
910d9e6
Disable spinner on current breadcrumb
oparoz Jun 16, 2016
757f416
Fix the name of the album in the breadcrumbs ellipsis tooltip
oparoz Jun 16, 2016
418e26a
Replace our custom small-dark spinner with the official one
oparoz Jun 16, 2016
155b8de
Re-activate spinner on home when not on home
oparoz Jun 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,3 @@ http://www.bypeople.com/author/comatosed/*/
.mask.transparent {
opacity: 0;
}

.icon-loading-dark.small {
background-size: 16px;
}
14 changes: 11 additions & 3 deletions js/breadcrumb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
* Shows the dark spinner on the crumb
*/
showLoader: function () {
$(this).children('a').addClass("icon-loading-dark small");
$(this).addClass("icon-loading-small-dark");
},

/**
Expand Down Expand Up @@ -243,11 +243,17 @@
// We go through the array in reverse order
var crumbsElement = crumbs.get().reverse();
$(crumbsElement).each(function () {
$(this).click(self.showLoader);
if ($(this).hasClass('home')) {
$(this).show();
if (self.breadcrumbs.length > 2) {
$(this).click(self.showLoader);
}
return;
}
// 1st sub-album has no-parent and the breadcrumbs contain home, ellipsis and last
if (self.breadcrumbs.length > 3) {
$(this).click(self.showLoader);
}
if ($(this).hasClass('ellipsis')) {
self.ellipsis = $(this);
return;
Expand All @@ -260,7 +266,9 @@
if (self.breadcrumbsElement.width() > availableWidth) {
shorten = true;
$(this).hide();
ellipsisPath = $(this).data('dir');
if (!ellipsisPath) {
ellipsisPath = $(this).data('dir');
}
}
});

Expand Down