diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index 6428ae9b5..101aa8a38 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -1,45 +1,49 @@
"use strict";
+/**
+ * Handle pasting images from clipboard.
+ * @param e - event
+ * @param editor - editor instance
+ */
function editorPaste(e, editor) {
if (!e.clipboardData) return
- var items = e.clipboardData.items;
+ let items = e.clipboardData.items;
if (!items) return;
- for (var i = 0; i < items.length; i++) {
- if (items[i].type.indexOf("image") !== -1) {
+ for (let i = 0; i < items.length; i++) {
+ if (items[i].type.indexOf("image") === -1) return
- var file = items[i].getAsFile();
- var formData = new FormData();
- var ext = 'png';
- var xhr = new XMLHttpRequest();
+ let file = items[i].getAsFile();
+ let formData = new FormData();
+ let ext = 'png';
+ let xhr = new XMLHttpRequest();
- if (file.name) {
- var fileNameMatches = file.name.match(/\.(.+)$/);
- if (fileNameMatches) {
- ext = fileNameMatches[1];
- }
+ if (file.name) {
+ let fileNameMatches = file.name.match(/\.(.+)$/);
+ if (fileNameMatches) {
+ ext = fileNameMatches[1];
}
-
- var id = "image-" + Math.random().toString(16).slice(2);
- var loadingImage = window.baseUrl('/loading.gif');
- editor.execCommand('mceInsertContent', false, '');
-
- var remoteFilename = "image-" + Date.now() + "." + ext;
- formData.append('file', file, remoteFilename);
- formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content'));
-
- xhr.open('POST', window.baseUrl('/images/gallery/upload'));
- xhr.onload = function () {
- if (xhr.status === 200 || xhr.status === 201) {
- var result = JSON.parse(xhr.responseText);
- editor.dom.setAttrib(id, 'src', result.thumbs.display);
- } else {
- console.log('An error occurred uploading the image');
- console.log(xhr.responseText);
- editor.dom.remove(id);
- }
- };
- xhr.send(formData);
}
+
+ let id = "image-" + Math.random().toString(16).slice(2);
+ let loadingImage = window.baseUrl('/loading.gif');
+ editor.execCommand('mceInsertContent', false, ``);
+
+ let remoteFilename = "image-" + Date.now() + "." + ext;
+ formData.append('file', file, remoteFilename);
+ formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content'));
+
+ xhr.open('POST', window.baseUrl('/images/gallery/upload'));
+ xhr.onload = function () {
+ if (xhr.status === 200 || xhr.status === 201) {
+ let result = JSON.parse(xhr.responseText);
+ editor.dom.setAttrib(id, 'src', result.thumbs.display);
+ } else {
+ console.log('An error occurred uploading the image', xhr.responseText);
+ editor.dom.remove(id);
+ }
+ };
+ xhr.send(formData);
+
}
}
@@ -101,7 +105,7 @@ var mceOptions = module.exports = {
if (type === 'file') {
window.showEntityLinkSelector(function(entity) {
- var originalField = win.document.getElementById(field_name);
+ let originalField = win.document.getElementById(field_name);
originalField.value = entity.link;
$(originalField).closest('.mce-form').find('input').eq(2).val(entity.name);
});
@@ -115,7 +119,7 @@ var mceOptions = module.exports = {
// to ensure the new value sticks
win.document.getElementById(field_name).value = image.url;
if ("createEvent" in document) {
- var evt = document.createEvent("HTMLEvents");
+ let evt = document.createEvent("HTMLEvents");
evt.initEvent("change", false, true);
win.document.getElementById(field_name).dispatchEvent(evt);
} else {
@@ -123,8 +127,8 @@ var mceOptions = module.exports = {
}
// Replace the actively selected content with the linked image
- var html = '';
- html += '';
+ let html = ``;
+ html += ``;
html += '';
win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
});
@@ -132,7 +136,7 @@ var mceOptions = module.exports = {
},
paste_preprocess: function (plugin, args) {
- var content = args.content;
+ let content = args.content;
if (content.indexOf('';
- html += '';
+ let html = ``;
+ html += ``;
html += '';
editor.execCommand('mceInsertContent', false, html);
});
diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 3cc41df07..9787571e2 100644
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -248,7 +248,7 @@
}
.tag-display {
- margin: $-xl $-xs;
+ margin: $-xl $-m;
border: 1px solid #DDD;
min-width: 180px;
max-width: 320px;