github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-02 23:56:56 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed bad image base-urls and forced tinyMCE to use absolute

Browse Source 
Also ensured image file existance is checked during base64 conversion
during exports.
Closes #171.
This commit is contained in:
Dan Brown
2016-09-03 19:24:58 +01:00
parent ec17bd8608
commit bbd8fff021
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/assets/js/pages/page-form.js
View File

@ -20,7 +20,8 @@ function editorPaste(e, editor) {
}
var id = "image-" + Math.random().toString(16).slice(2);
editor.execCommand('mceInsertContent', false, '<img src="/loading.gif" id="' + id + '">');
var loadingImage = window.baseUrl('/loading.gif');
editor.execCommand('mceInsertContent', false, '<img src="'+ loadingImage +'" id="' + id + '">');
var remoteFilename = "image-" + Date.now() + "." + ext;
formData.append('file', file, remoteFilename);
@ -30,7 +31,7 @@ function editorPaste(e, editor) {
xhr.onload = function () {
if (xhr.status === 200 || xhr.status === 201) {
var result = JSON.parse(xhr.responseText);
editor.dom.setAttrib(id, 'src', result.url);
editor.dom.setAttrib(id, 'src', result.thumbs.display);
} else {
console.log('An error occurred uploading the image');
console.log(xhr.responseText);
@ -63,6 +64,8 @@ var mceOptions = module.exports = {
],
body_class: 'page-content',
relative_urls: false,
remove_script_host: false,
document_base_url: window.baseUrl('/'),
statusbar: false,
menubar: false,
paste_data_images: false,