From 910d9e6faccd00726810e30fa79a1c796500871f Mon Sep 17 00:00:00 2001 From: Olivier Paroz Date: Fri, 17 Jun 2016 00:37:15 +0200 Subject: [PATCH 1/4] Disable spinner on current breadcrumb Fixes #638 [ci skip] --- js/breadcrumb.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/breadcrumb.js b/js/breadcrumb.js index 93ce1c746f..572d9023f0 100644 --- a/js/breadcrumb.js +++ b/js/breadcrumb.js @@ -243,11 +243,14 @@ // 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(); 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; From 757f4166449c1cb63c6cfd632e3a87beaba6e09b Mon Sep 17 00:00:00 2001 From: Olivier Paroz Date: Fri, 17 Jun 2016 00:38:07 +0200 Subject: [PATCH 2/4] Fix the name of the album in the breadcrumbs ellipsis tooltip [ci skip] --- js/breadcrumb.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/breadcrumb.js b/js/breadcrumb.js index 572d9023f0..f709d12f75 100644 --- a/js/breadcrumb.js +++ b/js/breadcrumb.js @@ -263,7 +263,9 @@ if (self.breadcrumbsElement.width() > availableWidth) { shorten = true; $(this).hide(); - ellipsisPath = $(this).data('dir'); + if (!ellipsisPath) { + ellipsisPath = $(this).data('dir'); + } } }); From 418e26ad8141ddbed124a2b890bfd6f969e7c367 Mon Sep 17 00:00:00 2001 From: Olivier Paroz Date: Fri, 17 Jun 2016 01:03:37 +0200 Subject: [PATCH 3/4] Replace our custom small-dark spinner with the official one [ci skip] --- css/styles.css | 4 ---- js/breadcrumb.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/css/styles.css b/css/styles.css index f8a69d4f2b..5ce4546c70 100644 --- a/css/styles.css +++ b/css/styles.css @@ -352,7 +352,3 @@ http://www.bypeople.com/author/comatosed/*/ .mask.transparent { opacity: 0; } - -.icon-loading-dark.small { - background-size: 16px; -} diff --git a/js/breadcrumb.js b/js/breadcrumb.js index f709d12f75..bb8d836a6b 100644 --- a/js/breadcrumb.js +++ b/js/breadcrumb.js @@ -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"); }, /** From 155b8de4ac52a72febb5b700a134f6435eb74305 Mon Sep 17 00:00:00 2001 From: Olivier Paroz Date: Sun, 19 Jun 2016 03:47:26 +0200 Subject: [PATCH 4/4] Re-activate spinner on home when not on home (cherry picked from commit dd9affe) --- js/breadcrumb.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/breadcrumb.js b/js/breadcrumb.js index bb8d836a6b..97cce72834 100644 --- a/js/breadcrumb.js +++ b/js/breadcrumb.js @@ -245,6 +245,9 @@ $(crumbsElement).each(function () { 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