Improved error messages for image uploads and formatted much js

[bookstack] / resources / assets / js / pages / page-form.js

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index cadccb59cfc79cd7772e9f7aaffd8ddff1dc0e4a..b5773ec7d527500e88f70c42a6b6bbc9601003c0 100644 (file)
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -1,4 +1,3 @@
-
 module.exports = {
     selector: '#html-editor',
     content_css: [
@@ -27,13 +26,13 @@ module.exports = {
         {title: "Code Block", icon: "code", format: "pre"},
         {title: "Inline Code", icon: "code", inline: "code"}
     ],
-    formats : {
-        alignleft : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-left'},
-        aligncenter : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-center'},
-        alignright : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-right'},
+    formats: {
+        alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-left'},
+        aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-center'},
+        alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-right'},
     },
-    file_browser_callback: function(field_name, url, type, win) {
-        ImageManager.show(function(image) {
+    file_browser_callback: function (field_name, url, type, win) {
+        ImageManager.show(function (image) {
             win.document.getElementById(field_name).value = image.url;
             if ("createEvent" in document) {
                 var evt = document.createEvent("HTMLEvents");
@@ -44,63 +43,63 @@ module.exports = {
             }
         });
     },
-    paste_preprocess: function(plugin, args) {
+    paste_preprocess: function (plugin, args) {
         var content = args.content;
-        if(content.indexOf('<img src="file://') !== -1) {
+        if (content.indexOf('<img src="file://') !== -1) {
             args.content = '';
         }
     },
-    setup: function(editor) {
+    setup: function (editor) {
 
-        ( function() {
+        (function () {
             var wrap;
 
-            function hasTextContent( node ) {
-                return node && !! ( node.textContent || node.innerText );
+            function hasTextContent(node) {
+                return node && !!( node.textContent || node.innerText );
             }
 
-            editor.on( 'dragstart', function() {
+            editor.on('dragstart', function () {
                 var node = editor.selection.getNode();
 
-                if ( node.nodeName === 'IMG' ) {
-                    wrap = editor.dom.getParent( node, '.mceTemp' );
+                if (node.nodeName === 'IMG') {
+                    wrap = editor.dom.getParent(node, '.mceTemp');
 
-                    if ( ! wrap && node.parentNode.nodeName === 'A' && ! hasTextContent( node.parentNode ) ) {
+                    if (!wrap && node.parentNode.nodeName === 'A' && !hasTextContent(node.parentNode)) {
                         wrap = node.parentNode;
                     }
                 }
-            } );
+            });
 
-            editor.on( 'drop', function( event ) {
+            editor.on('drop', function (event) {
                 var dom = editor.dom,
-                    rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint( event.clientX, event.clientY, editor.getDoc() );
+                    rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint(event.clientX, event.clientY, editor.getDoc());
 
                 // Don't allow anything to be dropped in a captioned image.
-                if ( dom.getParent( rng.startContainer, '.mceTemp' ) ) {
+                if (dom.getParent(rng.startContainer, '.mceTemp')) {
                     event.preventDefault();
-                } else if ( wrap ) {
+                } else if (wrap) {
                     event.preventDefault();
 
-                    editor.undoManager.transact( function() {
-                        editor.selection.setRng( rng );
-                        editor.selection.setNode( wrap );
-                        dom.remove( wrap );
-                    } );
+                    editor.undoManager.transact(function () {
+                        editor.selection.setRng(rng);
+                        editor.selection.setNode(wrap);
+                        dom.remove(wrap);
+                    });
                 }
 
                 wrap = null;
-            } );
-        } )();
+            });
+        })();
 
         // Image picker button
         editor.addButton('image-insert', {
             title: 'My title',
             icon: 'image',
             tooltip: 'Insert an image',
-            onclick: function() {
-                window.ImageManager.showExternal(function(image) {
-                    var html = '<a href="'+image.url+'" target="_blank">';
-                    html += '<img src="'+image.thumbs.display+'" alt="'+image.name+'">';
+            onclick: function () {
+                window.ImageManager.showExternal(function (image) {
+                    var html = '<a href="' + image.url + '" target="_blank">';
+                    html += '<img src="' + image.thumbs.display + '" alt="' + image.name + '">';
                     html += '</a>';
                     editor.execCommand('mceInsertContent', false, html);
                 });
@@ -108,10 +107,10 @@ module.exports = {
         });
 
         // Paste image-uploads
-        editor.on('paste', function(e) {
-            if(e.clipboardData) {
+        editor.on('paste', function (e) {
+            if (e.clipboardData) {
                 var items = e.clipboardData.items;
-                if (items){
+                if (items) {
                     for (var i = 0; i < items.length; i++) {
                         if (items[i].type.indexOf("image") !== -1) {
 
@@ -128,14 +127,14 @@ module.exports = {
                             }
 
                             var id = "image-" + Math.random().toString(16).slice(2);
-                            editor.execCommand('mceInsertContent', false, '<img src="/loading.gif" id="'+id+'">');
+                            editor.execCommand('mceInsertContent', false, '<img src="/loading.gif" id="' + id + '">');
 
                             var remoteFilename = "image-" + Date.now() + "." + ext;
                             formData.append('file', file, remoteFilename);
                             formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content'));
 
                             xhr.open('POST', '/upload/image');
-                            xhr.onload = function() {
+                            xhr.onload = function () {
                                 if (xhr.status === 200 || xhr.status === 201) {
                                     var result = JSON.parse(xhr.responseText);
                                     editor.dom.setAttrib(id, 'src', result.url);