github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-26 00:30:02 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'page_link_selector'

Browse Source
This commit is contained in:
Dan Brown
2016-09-03 10:40:27 +01:00
parent 63c6d3478d b14e9fc619
commit 0dbb8babee
15 changed files with 378 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ module.exports = function (ngApp, events) {
*/
function callbackAndHide(returnData) {
if (callback) callback(returnData);
$scope.showing = false;
$scope.hide();
}
/**
@ -109,6 +109,7 @@ module.exports = function (ngApp, events) {
function show(doneCallback) {
callback = doneCallback;
$scope.showing = true;
$('#image-manager').find('.overlay').css('display', 'flex').hide().fadeIn(240);
// Get initial images if they have not yet been loaded in.
if (!dataLoaded) {
fetchData();
@ -131,6 +132,7 @@ module.exports = function (ngApp, events) {
*/
$scope.hide = function () {
$scope.showing = false;
$('#image-manager').find('.overlay').fadeOut(240);
};
var baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/');