From e519236d94911a5c16aed8be6aabb5d9875da6f3 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 31 Dec 2015 17:19:29 +0000
Subject: [PATCH] Removed external fonts from page forms and remove initial
 form flicker

---
 resources/assets/js/pages/page-form.js | 6 +++---
 resources/assets/sass/_forms.scss      | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index b5773ec7d..756a9211b 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -1,8 +1,7 @@
 module.exports = {
     selector: '#html-editor',
     content_css: [
-        '/css/styles.css',
-        '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300'
+        '/css/styles.css'
     ],
     body_class: 'page-content',
     relative_urls: false,
@@ -133,7 +132,7 @@ module.exports = {
                             formData.append('file', file, remoteFilename);
                             formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content'));
 
-                            xhr.open('POST', '/upload/image');
+                            xhr.open('POST', '/images/gallery/upload');
                             xhr.onload = function () {
                                 if (xhr.status === 200 || xhr.status === 201) {
                                     var result = JSON.parse(xhr.responseText);
@@ -141,6 +140,7 @@ module.exports = {
                                 } else {
                                     console.log('An error occured uploading the image');
                                     console.log(xhr.responseText);
+                                    editor.dom.remove(id);
                                 }
                             };
                             xhr.send(formData);
diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss
index 98df40bf3..76c9674f5 100644
--- a/resources/assets/sass/_forms.scss
+++ b/resources/assets/sass/_forms.scss
@@ -22,6 +22,10 @@
   }
 }
 
+#html-editor {
+  display: none;
+}
+
 label {
   display: block;
   line-height: 1.4em;