From 86402d229fe1e2a5c7795cff072f262fa3c403f1 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Mon, 28 May 2018 12:03:52 -0400 Subject: [PATCH] fixing infobox error --- .../infopanel/info-panel.lightbox.gallery.component.html | 7 +------ .../infopanel/info-panel.lightbox.gallery.component.ts | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html index a0315237..f19c7963 100644 --- a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html +++ b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html @@ -27,12 +27,7 @@
- - {{ photo.metadata.creationDate | date :'longDate'}} - - - {{ photo.metadata.creationDate | date :'MMMM d'}} - + {{ photo.metadata.creationDate | date: (isThisYear() ? 'MMMM d': 'longDate')}}
{{ photo.metadata.creationDate | date :'EEEE'}}, {{getTime()}}
diff --git a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts index 369422f8..dabce203 100644 --- a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts +++ b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts @@ -31,8 +31,9 @@ export class InfoPanelLightboxComponent { return size.toFixed(2) + postFixes[index]; } - getCurrentYear() { - return (new Date()).getFullYear(); + isThisYear() { + return (new Date()).getFullYear() === + (new Date(this.photo.metadata.creationDate)).getFullYear(); }