webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-06 12:02:45 +03:00
Code Activity

Merge branch 'master' into dropzone-timeout

Browse Source
This commit is contained in:
Dan Brown
2018-12-22 15:08:54 +00:00
parent d3d3e2ad3e d910defbfd
commit 5fe630b8d2
65 changed files with 2348 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/services/code.js
View File

@@ -52,7 +52,7 @@ const modeMap = {
sh: 'shell',
bash: 'shell',
toml: 'toml',
sql: 'sql',
sql: 'text/x-sql',
xml: 'xml',
yaml: 'yaml',
yml: 'yaml',

4
resources/assets/js/vues/image-manager.js
View File

@@ -159,8 +159,8 @@ const methods = {
});
return;
}
this.$http.delete(`/images/${this.selectedImage.id}`).then(resp => {
let url = window.baseUrl(`/images/${this.selectedImage.id}`);
this.$http.delete(url).then(resp => {
this.images.splice(this.images.indexOf(this.selectedImage), 1);
this.selectedImage = false;
this.$events.emit('success', trans('components.image_delete_success'));