webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Merge branch 'conflict_warnings' of https://github.com/MatthieuParis/BookStack into MatthieuParis-conflict_warnings

Browse Source
This commit is contained in:
Dan Brown
2021-10-04 17:10:40 +01:00
parent e37bbf2925 3c4415f3ff
commit 756b55bbff
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/js/components/page-editor.js
View File

@ -119,6 +119,9 @@ class PageEditor {
}
this.draftNotifyChange(`${resp.data.message} ${Dates.utcTimeStampToLocalTime(resp.data.timestamp)}`);
this.autoSave.last = Date.now();
if (resp.data.warning.length > 0) {
window.$events.emit('warning', resp.data.warning);
}
} catch (err) {
// Save the editor content in LocalStorage as a last resort, just in case.
try {