github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-23 15:19:58 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fixed bug causing image manager popup not to show

Browse Source
This commit is contained in:
Dan Brown
2017-08-07 19:32:31 +01:00
parent 1ac7618bb1
commit a59d73de7b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/overlay.js
View File

@ -21,7 +21,7 @@ class Overlay {
let targetOpacity = show ? (elapsedTime / duration) : 1-(elapsedTime / duration); let targetOpacity = show ? (elapsedTime / duration) : 1-(elapsedTime / duration);
this.container.style.opacity = targetOpacity; this.container.style.opacity = targetOpacity;
if (elapsedTime > duration) { if (elapsedTime > duration) {
this.container.style.display = show ? 'display' : 'none'; this.container.style.display = show ? 'flex' : 'none';
this.container.style.opacity = ''; this.container.style.opacity = '';
} else { } else {
requestAnimationFrame(setOpacity.bind(this)); requestAnimationFrame(setOpacity.bind(this));

4
resources/assets/js/controllers.js
View File

@ -113,7 +113,7 @@ module.exports = function (ngApp, events) {
function show(doneCallback) { function show(doneCallback) {
callback = doneCallback; callback = doneCallback;
$scope.showing = true; $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. // Get initial images if they have not yet been loaded in.
if (!dataLoaded) { if (!dataLoaded) {
fetchData(); fetchData();
@ -136,7 +136,7 @@ module.exports = function (ngApp, events) {
*/ */
$scope.hide = function () { $scope.hide = function () {
$scope.showing = false; $scope.showing = false;
$('#image-manager').find('.overlay').fadeOut(240); $('#image-manager').find('[overlay]').fadeOut(240);
}; };
let baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/'); let baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/');