X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ac0b29fb6d05d6e943419b91fdbc09a59e20c89f..refs/pull/432/head:/resources/assets/js/controllers.js diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js index b5353e7d9..6a88aa811 100644 --- a/resources/assets/js/controllers.js +++ b/resources/assets/js/controllers.js @@ -1,6 +1,10 @@ "use strict"; const moment = require('moment'); +require('moment/locale/en-gb'); +const editorOptions = require("./pages/page-form"); + +moment.locale('en-gb'); module.exports = function (ngApp, events) { @@ -17,18 +21,18 @@ module.exports = function (ngApp, events) { $scope.imageDeleteSuccess = false; $scope.uploadedTo = $attrs.uploadedTo; $scope.view = 'all'; - + $scope.searching = false; $scope.searchTerm = ''; - var page = 0; - var previousClickTime = 0; - var previousClickImage = 0; - var dataLoaded = false; - var callback = false; + let page = 0; + let previousClickTime = 0; + let previousClickImage = 0; + let dataLoaded = false; + let callback = false; - var preSearchImages = []; - var preSearchHasMore = false; + let preSearchImages = []; + let preSearchHasMore = false; /** * Used by dropzone to get the endpoint to upload to. @@ -48,7 +52,7 @@ module.exports = function (ngApp, events) { $scope.hasMore = preSearchHasMore; } $scope.cancelSearch = cancelSearch; - + /** * Runs on image upload, Adds an image to local list of images @@ -60,7 +64,7 @@ module.exports = function (ngApp, events) { $scope.$apply(() => { $scope.images.unshift(data); }); - events.emit('success', 'Image uploaded'); + events.emit('success', trans('components.image_upload_success')); }; /** @@ -77,9 +81,9 @@ module.exports = function (ngApp, events) { * @param image */ $scope.imageSelect = function (image) { - var dblClickTime = 300; - var currentTime = Date.now(); - var timeDiff = currentTime - previousClickTime; + let dblClickTime = 300; + let currentTime = Date.now(); + let timeDiff = currentTime - previousClickTime; if (timeDiff < dblClickTime && image.id === previousClickImage) { // If double click @@ -135,22 +139,21 @@ module.exports = function (ngApp, events) { $('#image-manager').find('.overlay').fadeOut(240); }; - var baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/'); + let baseUrl = window.baseUrl('/images/' + $scope.imageType + '/all/'); /** * Fetch the list image data from the server. */ function fetchData() { - var url = baseUrl + page + '?'; - var components = {}; + let url = baseUrl + page + '?'; + let components = {}; if ($scope.uploadedTo) components['page_id'] = $scope.uploadedTo; if ($scope.searching) components['term'] = $scope.searchTerm; - var urlQueryString = Object.keys(components).map((key) => { + url += Object.keys(components).map((key) => { return key + '=' + encodeURIComponent(components[key]); }).join('&'); - url += urlQueryString; $http.get(url).then((response) => { $scope.images = $scope.images.concat(response.data.images); @@ -162,7 +165,6 @@ module.exports = function (ngApp, events) { /** * Start a search operation - * @param searchTerm */ $scope.searchImages = function() { @@ -196,7 +198,7 @@ module.exports = function (ngApp, events) { $scope.view = viewName; baseUrl = window.baseUrl('/images/' + $scope.imageType + '/' + viewName + '/'); fetchData(); - } + }; /** * Save the details of an image. @@ -204,13 +206,13 @@ module.exports = function (ngApp, events) { */ $scope.saveImageDetails = function (event) { event.preventDefault(); - var url = window.baseUrl('/images/update/' + $scope.selectedImage.id); - $http.put(url, this.selectedImage).then((response) => { - events.emit('success', 'Image details updated'); + let url = window.baseUrl('/images/update/' + $scope.selectedImage.id); + $http.put(url, this.selectedImage).then(response => { + events.emit('success', trans('components.image_update_success')); }, (response) => { if (response.status === 422) { - var errors = response.data; - var message = ''; + let errors = response.data; + let message = ''; Object.keys(errors).forEach((key) => { message += errors[key].join('\n'); }); @@ -229,13 +231,13 @@ module.exports = function (ngApp, events) { */ $scope.deleteImage = function (event) { event.preventDefault(); - var force = $scope.dependantPages !== false; - var url = window.baseUrl('/images/' + $scope.selectedImage.id); + let force = $scope.dependantPages !== false; + let 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); $scope.selectedImage = false; - events.emit('success', 'Image successfully deleted'); + events.emit('success', trans('components.image_delete_success')); }, (response) => { // Pages failure if (response.status === 400) { @@ -257,63 +259,30 @@ module.exports = function (ngApp, events) { }]); - - ngApp.controller('BookShowController', ['$scope', '$http', '$attrs', '$sce', function ($scope, $http, $attrs, $sce) { - $scope.searching = false; - $scope.searchTerm = ''; - $scope.searchResults = ''; - - $scope.searchBook = function (e) { - e.preventDefault(); - var term = $scope.searchTerm; - if (term.length == 0) return; - $scope.searching = true; - $scope.searchResults = ''; - var searchUrl = window.baseUrl('/search/book/' + $attrs.bookId); - searchUrl += '?term=' + encodeURIComponent(term); - $http.get(searchUrl).then((response) => { - $scope.searchResults = $sce.trustAsHtml(response.data); - }); - }; - - $scope.checkSearchForm = function () { - if ($scope.searchTerm.length < 1) { - $scope.searching = false; - } - }; - - $scope.clearSearch = function () { - $scope.searching = false; - $scope.searchTerm = ''; - }; - - }]); - - ngApp.controller('PageEditController', ['$scope', '$http', '$attrs', '$interval', '$timeout', '$sce', function ($scope, $http, $attrs, $interval, $timeout, $sce) { - $scope.editorOptions = require('./pages/page-form'); + $scope.editorOptions = editorOptions(); $scope.editContent = ''; $scope.draftText = ''; - var pageId = Number($attrs.pageId); - var isEdit = pageId !== 0; - var autosaveFrequency = 30; // AutoSave interval in seconds. - var isMarkdown = $attrs.editorType === 'markdown'; + let pageId = Number($attrs.pageId); + let isEdit = pageId !== 0; + let autosaveFrequency = 30; // AutoSave interval in seconds. + let isMarkdown = $attrs.editorType === 'markdown'; $scope.draftsEnabled = $attrs.draftsEnabled === 'true'; $scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1; $scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1; - // Set inital header draft text + // Set initial header draft text if ($scope.isUpdateDraft || $scope.isNewPageDraft) { - $scope.draftText = 'Editing Draft' + $scope.draftText = trans('entities.pages_editing_draft'); } else { - $scope.draftText = 'Editing Page' - }; + $scope.draftText = trans('entities.pages_editing_page'); + } - var autoSave = false; + let autoSave = false; - var currentContent = { + let currentContent = { title: false, html: false }; @@ -350,8 +319,8 @@ module.exports = function (ngApp, events) { 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; + let newTitle = $('#name').val(); + let newHtml = $scope.editContent; if (newTitle !== currentContent.title || newHtml !== currentContent.html) { currentContent.html = newHtml; @@ -368,7 +337,7 @@ module.exports = function (ngApp, events) { */ function saveDraft() { if (!$scope.draftsEnabled) return; - var data = { + let data = { name: $('#name').val(), html: isMarkdown ? $sce.getTrustedHtml($scope.displayContent) : $scope.editContent }; @@ -378,14 +347,14 @@ module.exports = function (ngApp, events) { 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(); + let 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.') + events.emit('error', trans('errors.page_draft_autosave_fail')); draftErroring = true; }); } @@ -418,7 +387,7 @@ module.exports = function (ngApp, events) { let url = window.baseUrl('/ajax/page/' + pageId); $http.get(url).then((responseData) => { if (autoSave) $interval.cancel(autoSave); - $scope.draftText = 'Editing Page'; + $scope.draftText = trans('entities.pages_editing_page'); $scope.isUpdateDraft = false; $scope.$broadcast('html-update', responseData.data.html); $scope.$broadcast('markdown-update', responseData.data.markdown || responseData.data.html); @@ -426,7 +395,7 @@ module.exports = function (ngApp, events) { $timeout(() => { startAutoSave(); }, 1000); - events.emit('success', 'Draft discarded, The editor has been updated with the current page content'); + events.emit('success', trans('entities.pages_draft_discarded')); }); }; @@ -437,7 +406,7 @@ module.exports = function (ngApp, events) { const pageId = Number($attrs.pageId); $scope.tags = []; - + $scope.sortOptions = { handle: '.handle', items: '> tr', @@ -504,20 +473,6 @@ module.exports = function (ngApp, events) { } }; - /** - * Save the tags to the current page. - */ - $scope.saveTags = function() { - setTagOrder(); - let postData = {tags: $scope.tags}; - 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); - }) - }; - /** * Remove a tag from the current list. * @param tag @@ -536,6 +491,18 @@ module.exports = function (ngApp, events) { 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 = { @@ -557,28 +524,29 @@ module.exports = function (ngApp, events) { if (newOrder === currentOrder) return; currentOrder = newOrder; - $http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => { + $http.put(window.baseUrl(`/attachments/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 () { - return window.baseUrl('/files/upload'); + $scope.getUploadUrl = function (file) { + let suffix = (typeof file !== 'undefined') ? `/${file.id}` : ''; + return window.baseUrl(`/attachments/upload${suffix}`); }; /** * Get files for the current page from the server. */ function getFiles() { - let url = window.baseUrl(`/files/get/page/${pageId}`) + let url = window.baseUrl(`/attachments/get/page/${pageId}`); $http.get(url).then(resp => { $scope.files = resp.data; currentOrder = resp.data.map(file => {return file.id}).join(':'); - }); + }, checkError('get')); } getFiles(); @@ -590,9 +558,27 @@ module.exports = function (ngApp, events) { */ $scope.uploadSuccess = function (file, data) { $scope.$apply(() => { - $scope.files.unshift(data); + $scope.files.push(data); }); - events.emit('success', 'File uploaded'); + events.emit('success', trans('entities.attachments_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', trans('entities.attachments_file_updated')); }; /** @@ -600,29 +586,99 @@ module.exports = function (ngApp, events) { * @param file */ $scope.deleteFile = function(file) { - $http.delete(`/files/${file.id}`).then(resp => { + if (!file.deleting) { + file.deleting = true; + return; + } + $http.delete(window.baseUrl(`/attachments/${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 file + */ + $scope.attachLinkSubmit = function(file) { + file.uploaded_to = pageId; + $http.post(window.baseUrl('/attachments/link'), file).then(resp => { + $scope.files.push(resp.data); + events.emit('success', trans('entities.attachments_link_attached')); + $scope.file = getCleanFile(); + }, checkError('link')); + }; + /** + * Start the edit mode for a file. + * @param file + */ + $scope.startEdit = function(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(window.baseUrl(`/attachments/${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', trans('entities.attachments_updated_success')); + }, checkError('edit')); + }; + /** + * Get the url of a file. + */ + $scope.getFileUrl = function(file) { + return window.baseUrl('/attachments/' + 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 errorGroupName + */ + 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]) + } + } + } + }]); +};