X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/5942d796b51ef9f565ebd88ebeabe40e1f078a47..refs/pull/232/head:/resources/assets/js/controllers.js diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js index 406fd7e77..f4f1f3e39 100644 --- a/resources/assets/js/controllers.js +++ b/resources/assets/js/controllers.js @@ -1,6 +1,8 @@ "use strict"; -var moment = require('moment'); +import moment from 'moment'; +import 'moment/locale/en-gb'; +moment.locale('en-gb'); module.exports = function (ngApp, events) { @@ -17,7 +19,7 @@ module.exports = function (ngApp, events) { $scope.imageDeleteSuccess = false; $scope.uploadedTo = $attrs.uploadedTo; $scope.view = 'all'; - + $scope.searching = false; $scope.searchTerm = ''; @@ -35,7 +37,7 @@ module.exports = function (ngApp, events) { * @returns {string} */ $scope.getUploadUrl = function () { - return '/images/' + $scope.imageType + '/upload'; + return window.baseUrl('/images/' + $scope.imageType + '/upload'); }; /** @@ -48,7 +50,7 @@ module.exports = function (ngApp, events) { $scope.hasMore = preSearchHasMore; } $scope.cancelSearch = cancelSearch; - + /** * Runs on image upload, Adds an image to local list of images @@ -69,7 +71,7 @@ module.exports = function (ngApp, events) { */ function callbackAndHide(returnData) { if (callback) callback(returnData); - $scope.showing = false; + $scope.hide(); } /** @@ -109,6 +111,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,9 +134,10 @@ module.exports = function (ngApp, events) { */ $scope.hide = function () { $scope.showing = false; + $('#image-manager').find('.overlay').fadeOut(240); }; - var baseUrl = '/images/' + $scope.imageType + '/all/' + var baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/'); /** * Fetch the list image data from the server. @@ -178,7 +182,7 @@ module.exports = function (ngApp, events) { $scope.images = []; $scope.hasMore = false; page = 0; - baseUrl = '/images/' + $scope.imageType + '/search/'; + baseUrl = window.baseUrl('/images/' + $scope.imageType + '/search/'); fetchData(); }; @@ -192,7 +196,7 @@ module.exports = function (ngApp, events) { $scope.hasMore = false; page = 0; $scope.view = viewName; - baseUrl = '/images/' + $scope.imageType + '/' + viewName + '/'; + baseUrl = window.baseUrl('/images/' + $scope.imageType + '/' + viewName + '/'); fetchData(); } @@ -202,7 +206,7 @@ module.exports = function (ngApp, events) { */ $scope.saveImageDetails = function (event) { event.preventDefault(); - var url = '/images/update/' + $scope.selectedImage.id; + var url = window.baseUrl('/images/update/' + $scope.selectedImage.id); $http.put(url, this.selectedImage).then((response) => { events.emit('success', 'Image details updated'); }, (response) => { @@ -228,7 +232,7 @@ module.exports = function (ngApp, events) { $scope.deleteImage = function (event) { event.preventDefault(); var force = $scope.dependantPages !== false; - var url = '/images/' + $scope.selectedImage.id; + var url = window.baseUrl('/images/' + $scope.selectedImage.id); if (force) url += '?force=true'; $http.delete(url).then((response) => { $scope.images.splice($scope.images.indexOf($scope.selectedImage), 1); @@ -267,7 +271,7 @@ module.exports = function (ngApp, events) { if (term.length == 0) return; $scope.searching = true; $scope.searchResults = ''; - var searchUrl = '/search/book/' + $attrs.bookId; + var searchUrl = window.baseUrl('/search/book/' + $attrs.bookId); searchUrl += '?term=' + encodeURIComponent(term); $http.get(searchUrl).then((response) => { $scope.searchResults = $sce.trustAsHtml(response.data); @@ -298,6 +302,7 @@ module.exports = function (ngApp, events) { var isEdit = pageId !== 0; var autosaveFrequency = 30; // AutoSave interval in seconds. var isMarkdown = $attrs.editorType === 'markdown'; + $scope.draftsEnabled = $attrs.draftsEnabled === 'true'; $scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1; $scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1; @@ -315,7 +320,7 @@ module.exports = function (ngApp, events) { html: false }; - if (isEdit) { + if (isEdit && $scope.draftsEnabled) { setTimeout(() => { startAutoSave(); }, 1000); @@ -334,6 +339,8 @@ module.exports = function (ngApp, events) { $scope.editorChange = function() {}; } + let lastSave = 0; + /** * Start the AutoSave loop, Checks for content change * before performing the costly AJAX request. @@ -343,6 +350,8 @@ module.exports = function (ngApp, events) { currentContent.html = $scope.editContent; autoSave = $interval(() => { + // Return if manually saved recently to prevent bombarding the server + if (Date.now() - lastSave < (1000*autosaveFrequency)/2) return; var newTitle = $('#name').val(); var newHtml = $scope.editContent; @@ -355,12 +364,12 @@ module.exports = function (ngApp, events) { }, 1000 * autosaveFrequency); } + let draftErroring = false; /** * Save a draft update into the system via an AJAX request. - * @param title - * @param html */ function saveDraft() { + if (!$scope.draftsEnabled) return; var data = { name: $('#name').val(), html: isMarkdown ? $sce.getTrustedHtml($scope.displayContent) : $scope.editContent @@ -368,13 +377,28 @@ module.exports = function (ngApp, events) { if (isMarkdown) data.markdown = $scope.editContent; - $http.put('/ajax/page/' + pageId + '/save-draft', data).then((responseData) => { + let url = window.baseUrl('/ajax/page/' + pageId + '/save-draft'); + $http.put(url, data).then(responseData => { + draftErroring = false; var updateTime = moment.utc(moment.unix(responseData.data.timestamp)).toDate(); $scope.draftText = responseData.data.message + moment(updateTime).format('HH:mm'); if (!$scope.isNewPageDraft) $scope.isUpdateDraft = true; + showDraftSaveNotification(); + lastSave = Date.now(); + }, errorRes => { + if (draftErroring) return; + events.emit('error', 'Failed to save draft. Ensure you have internet connection before saving this page.') + draftErroring = true; }); } + function showDraftSaveNotification() { + $scope.draftUpdated = true; + $timeout(() => { + $scope.draftUpdated = false; + }, 2000) + } + $scope.forceDraftSave = function() { saveDraft(); }; @@ -393,7 +417,8 @@ module.exports = function (ngApp, events) { * content from the system via an AJAX request. */ $scope.discardDraft = function () { - $http.get('/ajax/page/' + pageId).then((responseData) => { + let url = window.baseUrl('/ajax/page/' + pageId); + $http.get(url).then((responseData) => { if (autoSave) $interval.cancel(autoSave); $scope.draftText = 'Editing Page'; $scope.isUpdateDraft = false; @@ -414,7 +439,7 @@ module.exports = function (ngApp, events) { const pageId = Number($attrs.pageId); $scope.tags = []; - + $scope.sortOptions = { handle: '.handle', items: '> tr', @@ -437,7 +462,8 @@ module.exports = function (ngApp, events) { * Get all tags for the current book and add into scope. */ function getTags() { - $http.get('/ajax/tags/get/page/' + pageId).then((responseData) => { + let url = window.baseUrl(`/ajax/tags/get/page/${pageId}`); + $http.get(url).then((responseData) => { $scope.tags = responseData.data; addEmptyTag(); }); @@ -486,7 +512,8 @@ module.exports = function (ngApp, events) { $scope.saveTags = function() { setTagOrder(); let postData = {tags: $scope.tags}; - $http.post('/ajax/tags/update/page/' + pageId, postData).then((responseData) => { + let url = window.baseUrl('/ajax/tags/update/page/' + pageId); + $http.post(url, postData).then((responseData) => { $scope.tags = responseData.data.tags; addEmptyTag(); events.emit('success', responseData.data.message); @@ -504,21 +531,203 @@ module.exports = function (ngApp, events) { }]); -}; + ngApp.controller('PageAttachmentController', ['$scope', '$http', '$attrs', + function ($scope, $http, $attrs) { + + const pageId = $scope.uploadedTo = $attrs.pageId; + let currentOrder = ''; + $scope.files = []; + $scope.editFile = false; + $scope.file = getCleanFile(); + $scope.errors = { + link: {}, + edit: {} + }; + function getCleanFile() { + return { + page_id: pageId + }; + } + // Angular-UI-Sort options + $scope.sortOptions = { + handle: '.handle', + items: '> tr', + containment: "parent", + axis: "y", + stop: sortUpdate, + }; + /** + * Event listener for sort changes. + * Updates the file ordering on the server. + * @param event + * @param ui + */ + function sortUpdate(event, ui) { + let newOrder = $scope.files.map(file => {return file.id}).join(':'); + if (newOrder === currentOrder) return; + + currentOrder = newOrder; + $http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => { + events.emit('success', resp.data.message); + }, checkError('sort')); + } + /** + * Used by dropzone to get the endpoint to upload to. + * @returns {string} + */ + $scope.getUploadUrl = function (file) { + let suffix = (typeof file !== 'undefined') ? `/${file.id}` : ''; + return window.baseUrl(`/files/upload${suffix}`); + }; + + /** + * Get files for the current page from the server. + */ + function getFiles() { + let url = window.baseUrl(`/files/get/page/${pageId}`) + $http.get(url).then(resp => { + $scope.files = resp.data; + currentOrder = resp.data.map(file => {return file.id}).join(':'); + }, checkError('get')); + } + getFiles(); + + /** + * Runs on file upload, Adds an file to local file list + * and shows a success message to the user. + * @param file + * @param data + */ + $scope.uploadSuccess = function (file, data) { + $scope.$apply(() => { + $scope.files.push(data); + }); + events.emit('success', 'File uploaded'); + }; + + /** + * Upload and overwrite an existing file. + * @param file + * @param data + */ + $scope.uploadSuccessUpdate = function (file, data) { + $scope.$apply(() => { + let search = filesIndexOf(data); + if (search !== -1) $scope.files[search] = data; + if ($scope.editFile) { + $scope.editFile = angular.copy(data); + data.link = ''; + } + }); + events.emit('success', 'File updated'); + }; + /** + * Delete a file from the server and, on success, the local listing. + * @param file + */ + $scope.deleteFile = function(file) { + if (!file.deleting) { + file.deleting = true; + return; + } + $http.delete(`/files/${file.id}`).then(resp => { + events.emit('success', resp.data.message); + $scope.files.splice($scope.files.indexOf(file), 1); + }, checkError('delete')); + }; + /** + * Attach a link to a page. + * @param fileName + * @param fileLink + */ + $scope.attachLinkSubmit = function(file) { + file.uploaded_to = pageId; + $http.post('/files/link', file).then(resp => { + $scope.files.push(resp.data); + events.emit('success', 'Link attached'); + $scope.file = getCleanFile(); + }, checkError('link')); + }; + /** + * Start the edit mode for a file. + * @param fileId + */ + $scope.startEdit = function(file) { + console.log(file); + $scope.editFile = angular.copy(file); + $scope.editFile.link = (file.external) ? file.path : ''; + }; + /** + * Cancel edit mode + */ + $scope.cancelEdit = function() { + $scope.editFile = false; + }; + /** + * Update the name and link of a file. + * @param file + */ + $scope.updateFile = function(file) { + $http.put(`/files/${file.id}`, file).then(resp => { + let search = filesIndexOf(resp.data); + if (search !== -1) $scope.files[search] = resp.data; + if ($scope.editFile && !file.external) { + $scope.editFile.link = ''; + } + $scope.editFile = false; + events.emit('success', 'Attachment details updated'); + }, checkError('edit')); + }; + /** + * Get the url of a file. + */ + $scope.getFileUrl = function(file) { + return window.baseUrl('/files/' + file.id); + } + /** + * Search the local files via another file object. + * Used to search via object copies. + * @param file + * @returns int + */ + function filesIndexOf(file) { + for (let i = 0; i < $scope.files.length; i++) { + if ($scope.files[i].id == file.id) return i; + } + return -1; + } + /** + * Check for an error response in a ajax request. + * @param response + */ + function checkError(errorGroupName) { + $scope.errors[errorGroupName] = {}; + return function(response) { + if (typeof response.data !== 'undefined' && typeof response.data.error !== 'undefined') { + events.emit('error', response.data.error); + } + if (typeof response.data !== 'undefined' && typeof response.data.validation !== 'undefined') { + $scope.errors[errorGroupName] = response.data.validation; + console.log($scope.errors[errorGroupName]) + } + } + } + }]); +};