From a59d73de7b8b5f00d647b4eefdafd7de08103fa4 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Mon, 7 Aug 2017 19:32:31 +0100 Subject: [PATCH] Fixed bug causing image manager popup not to show --- resources/assets/js/components/overlay.js | 2 +- resources/assets/js/controllers.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/components/overlay.js b/resources/assets/js/components/overlay.js index 6984928bd..6e7a598ac 100644 --- a/resources/assets/js/components/overlay.js +++ b/resources/assets/js/components/overlay.js @@ -21,7 +21,7 @@ class Overlay { let targetOpacity = show ? (elapsedTime / duration) : 1-(elapsedTime / duration); this.container.style.opacity = targetOpacity; if (elapsedTime > duration) { - this.container.style.display = show ? 'display' : 'none'; + this.container.style.display = show ? 'flex' : 'none'; this.container.style.opacity = ''; } else { requestAnimationFrame(setOpacity.bind(this)); diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js index e1d838bb6..4acb40b35 100644 --- a/resources/assets/js/controllers.js +++ b/resources/assets/js/controllers.js @@ -113,7 +113,7 @@ module.exports = function (ngApp, events) { function show(doneCallback) { callback = doneCallback; $scope.showing = true; - $('#image-manager').find('.overlay').css('display', 'flex').hide().fadeIn(240); + $('#image-manager').find('[overlay]').css('display', 'flex').hide().fadeIn(240); // Get initial images if they have not yet been loaded in. if (!dataLoaded) { fetchData(); @@ -136,7 +136,7 @@ module.exports = function (ngApp, events) { */ $scope.hide = function () { $scope.showing = false; - $('#image-manager').find('.overlay').fadeOut(240); + $('#image-manager').find('[overlay]').fadeOut(240); }; let baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/');