X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/30214fde74c954ee6cf4daeb562764343b546b58..refs/pull/479/head:/resources/assets/js/controllers.js diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js index 76b8cc67d..32ff76fa1 100644 --- a/resources/assets/js/controllers.js +++ b/resources/assets/js/controllers.js @@ -1,243 +1,62 @@ "use strict"; -module.exports = function (ngApp, events) { - - ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService', - function ($scope, $attrs, $http, $timeout, imageManagerService) { - $scope.images = []; - $scope.imageType = $attrs.imageType; - $scope.selectedImage = false; - $scope.dependantPages = false; - $scope.showing = false; - $scope.hasMore = false; - $scope.imageUpdateSuccess = false; - $scope.imageDeleteSuccess = false; - var page = 0; - var previousClickTime = 0; - var dataLoaded = false; - var callback = false; - - /** - * Simple returns the appropriate upload url depending on the image type set. - * @returns {string} - */ - $scope.getUploadUrl = function () { - return '/images/' + $scope.imageType + '/upload'; - }; - - /** - * Runs on image upload, Adds an image to local list of images - * and shows a success message to the user. - * @param file - * @param data - */ - $scope.uploadSuccess = function (file, data) { - $scope.$apply(() => { - $scope.images.unshift(data); - }); - events.emit('success', 'Image uploaded'); - }; - - /** - * Runs the callback and hides the image manager. - * @param returnData - */ - function callbackAndHide(returnData) { - if (callback) callback(returnData); - $scope.showing = false; - } +const moment = require('moment'); +require('moment/locale/en-gb'); +const editorOptions = require("./pages/page-form"); - /** - * Image select action. Checks if a double-click was fired. - * @param image - */ - $scope.imageSelect = function (image) { - var dblClickTime = 300; - var currentTime = Date.now(); - var timeDiff = currentTime - previousClickTime; - - if (timeDiff < dblClickTime) { - // If double click - callbackAndHide(image); - } else { - // If single - $scope.selectedImage = image; - $scope.dependantPages = false; - } - previousClickTime = currentTime; - }; - - /** - * Action that runs when the 'Select image' button is clicked. - * Runs the callback and hides the image manager. - */ - $scope.selectButtonClick = function () { - callbackAndHide($scope.selectedImage); - }; - - /** - * Show the image manager. - * Takes a callback to execute later on. - * @param doneCallback - */ - function show(doneCallback) { - callback = doneCallback; - $scope.showing = true; - // Get initial images if they have not yet been loaded in. - if (!dataLoaded) { - fetchData(); - dataLoaded = true; - } - } - - // Connects up the image manger so it can be used externally - // such as from TinyMCE. - imageManagerService.show = show; - imageManagerService.showExternal = function (doneCallback) { - $scope.$apply(() => { - show(doneCallback); - }); - }; - window.ImageManager = imageManagerService; - - /** - * Hide the image manager - */ - $scope.hide = function () { - $scope.showing = false; - }; - - /** - * Fetch the list image data from the server. - */ - function fetchData() { - var url = '/images/' + $scope.imageType + '/all/' + page; - $http.get(url).then((response) => { - $scope.images = $scope.images.concat(response.data.images); - $scope.hasMore = response.data.hasMore; - page++; - }); - } - - $scope.fetchData = fetchData; - - /** - * Save the details of an image. - * @param event - */ - $scope.saveImageDetails = function (event) { - event.preventDefault(); - var url = '/images/update/' + $scope.selectedImage.id; - $http.put(url, this.selectedImage).then((response) => { - events.emit('success', 'Image details updated'); - }, (response) => { - if (response.status === 422) { - var errors = response.data; - var message = ''; - Object.keys(errors).forEach((key) => { - message += errors[key].join('\n'); - }); - events.emit('error', message); - } else if (response.status === 403) { - events.emit('error', response.data.error); - } - }); - }; - - /** - * Delete an image from system and notify of success. - * Checks if it should force delete when an image - * has dependant pages. - * @param event - */ - $scope.deleteImage = function (event) { - event.preventDefault(); - var force = $scope.dependantPages !== false; - var url = '/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'); - }, (response) => { - // Pages failure - if (response.status === 400) { - $scope.dependantPages = response.data; - } else if (response.status === 403) { - events.emit('error', response.data.error); - } - }); - }; - - /** - * Simple date creator used to properly format dates. - * @param stringDate - * @returns {Date} - */ - $scope.getDate = function (stringDate) { - return new Date(stringDate); - }; +moment.locale('en-gb'); - }]); - - - 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 = '/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 = ''; - }; - - }]); +module.exports = function (ngApp, events) { - ngApp.controller('PageEditController', ['$scope', '$http', '$attrs', '$interval', '$timeout', function ($scope, $http, $attrs, $interval, $timeout) { + ngApp.controller('PageEditController', ['$scope', '$http', '$attrs', '$interval', '$timeout', '$sce', + function ($scope, $http, $attrs, $interval, $timeout, $sce) { - $scope.editorOptions = require('./pages/page-form'); - $scope.editorHtml = ''; + $scope.editorOptions = editorOptions(); + $scope.editContent = ''; $scope.draftText = ''; - var pageId = Number($attrs.pageId); - var isEdit = pageId !== 0; - var autosaveFrequency = 30; // AutoSave interval in seconds. - $scope.isDraft = Number($attrs.pageDraft) === 1; - if ($scope.isDraft) $scope.draftText = 'Editing Draft'; + 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 initial header draft text + if ($scope.isUpdateDraft || $scope.isNewPageDraft) { + $scope.draftText = trans('entities.pages_editing_draft'); + } else { + $scope.draftText = trans('entities.pages_editing_page'); + } - var autoSave = false; + let autoSave = false; - var currentContent = { + let currentContent = { title: false, html: false }; - if (isEdit) { + if (isEdit && $scope.draftsEnabled) { setTimeout(() => { startAutoSave(); }, 1000); } - $scope.editorChange = function () {} + // Actions specifically for the markdown editor + if (isMarkdown) { + $scope.displayContent = ''; + // Editor change event + $scope.editorChange = function (content) { + $scope.displayContent = $sce.trustAsHtml(content); + } + } + + if (!isMarkdown) { + $scope.editorChange = function() {}; + } + + let lastSave = 0; /** * Start the AutoSave loop, Checks for content change @@ -245,53 +64,84 @@ module.exports = function (ngApp, events) { */ function startAutoSave() { currentContent.title = $('#name').val(); - currentContent.html = $scope.editorHtml; + currentContent.html = $scope.editContent; autoSave = $interval(() => { - var newTitle = $('#name').val(); - var newHtml = $scope.editorHtml; + // Return if manually saved recently to prevent bombarding the server + if (Date.now() - lastSave < (1000*autosaveFrequency)/2) return; + let newTitle = $('#name').val(); + let newHtml = $scope.editContent; if (newTitle !== currentContent.title || newHtml !== currentContent.html) { currentContent.html = newHtml; currentContent.title = newTitle; - saveDraftUpdate(newTitle, newHtml); + saveDraft(); } + }, 1000 * autosaveFrequency); } + let draftErroring = false; /** * Save a draft update into the system via an AJAX request. - * @param title - * @param html */ - function saveDraftUpdate(title, html) { - $http.put('/ajax/page/' + pageId + '/save-draft', { - name: title, - html: html - }).then((responseData) => { - $scope.draftText = responseData.data.message; - $scope.isDraft = true; + function saveDraft() { + if (!$scope.draftsEnabled) return; + let data = { + name: $('#name').val(), + html: isMarkdown ? $sce.getTrustedHtml($scope.displayContent) : $scope.editContent + }; + + if (isMarkdown) data.markdown = $scope.editContent; + + let url = window.baseUrl('/ajax/page/' + pageId + '/save-draft'); + $http.put(url, data).then(responseData => { + draftErroring = false; + 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', trans('errors.page_draft_autosave_fail')); + draftErroring = true; }); } + function showDraftSaveNotification() { + $scope.draftUpdated = true; + $timeout(() => { + $scope.draftUpdated = false; + }, 2000) + } + + $scope.forceDraftSave = function() { + saveDraft(); + }; + + // Listen to save draft events from editor + $scope.$on('save-draft', saveDraft); + /** * Discard the current draft and grab the current page * 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 = ''; - $scope.isDraft = false; + $scope.draftText = trans('entities.pages_editing_page'); + $scope.isUpdateDraft = false; $scope.$broadcast('html-update', responseData.data.html); - $('#name').val(currentContent.title); + $scope.$broadcast('markdown-update', responseData.data.markdown || responseData.data.html); + $('#name').val(responseData.data.name); $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')); }); }; }]); - -}; \ No newline at end of file +};