From 727f539143bb0ed560f9376271da6afbe2df5a6c Mon Sep 17 00:00:00 2001
From: Micheal Mand <micheal@kmdwebdesigns.com>
Date: Sat, 3 Nov 2018 16:02:55 -0600
Subject: [PATCH 1/2] Allow CKEditor custom config to work on Vue component

Also cleaned up styling issues; thank you ESLint.

Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>
---
 .../Core/Assets/js/components/CkEditor.vue    | 95 ++++++++++---------
 .../Adminlte/views/layouts/master.blade.php   |  1 +
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/Modules/Core/Assets/js/components/CkEditor.vue b/Modules/Core/Assets/js/components/CkEditor.vue
index b726c12d5..68cf62e9d 100644
--- a/Modules/Core/Assets/js/components/CkEditor.vue
+++ b/Modules/Core/Assets/js/components/CkEditor.vue
@@ -1,13 +1,12 @@
 <template>
-    <div class="ckeditor">
-        <textarea
-                :name="name"
-                :id="id"
-                :value="value"
-                :types="types"
-                :config="config">
-        </textarea>
-    </div>
+    <textarea
+        :name="name"
+        :id="id"
+        :value="value"
+        :types="types"
+        :config="config"
+        class="ckeditor"
+    ></textarea>
 </template>
 
 <script>
@@ -18,77 +17,87 @@
         props: {
             name: {
                 type: String,
-                default: () => `editor-${++inc}`
+                default: () => `editor-${++inc}`,
             },
             value: {
-                type: String
+                type: String,
+                default: () => '',
             },
             id: {
                 type: String,
-                default: () => `editor-${inc}`
+                default: () => `editor-${inc}`,
             },
             types: {
                 type: String,
-                default: () => `classic`
+                default: () => 'classic',
             },
             config: {
                 type: Object,
-                default: () => {}
-            }
+                default: () => {
+                    if (window.AsgardCMS.ckeditorCustomConfig !== '') {
+                        return {
+                            customConfig: window.AsgardCMS.ckeditorCustomConfig,
+                        };
+                    }
+
+                    return undefined;
+                },
+            },
         },
-        data () {
-            return { destroyed: false }
+        data() {
+            return { destroyed: false };
         },
         computed: {
-            instance () {
-                return CKEDITOR.instances[this.id]
-            }
+            instance() {
+                return CKEDITOR.instances[this.id];
+            },
         },
         watch: {
-            value (val) {
+            value(val) {
                 if (this.instance) {
-                    let html = this.instance.getData();
+                    const html = this.instance.getData();
                     if (val !== html) {
                         this.instance.setData(val);
                     }
                 }
-            }
+            },
         },
-        mounted () {
+        mounted() {
             if (typeof CKEDITOR === 'undefined') {
-                console.log('CKEDITOR is missing (http://ckeditor.com/)')
+                console.log('CKEDITOR is missing (http://ckeditor.com/)');
             } else {
                 if (this.types === 'inline') {
-                    CKEDITOR.inline(this.id, this.config)
+                    CKEDITOR.inline(this.id, this.config);
                 } else {
-                    CKEDITOR.replace(this.id, this.config)
+                    CKEDITOR.replace(this.id, this.config);
                 }
                 this.instance.on('change', () => {
-                    let html = this.instance.getData()
+                    const html = this.instance.getData();
                     if (html !== this.value) {
-                        this.$emit('input', html)
-                        this.$emit('update:value', html)
+                        this.$emit('input', html);
+                        this.$emit('update:value', html);
                     }
-                })
+                });
                 this.instance.on('blur', () => {
-                    this.$emit('blur', this.instance)
-                })
+                    this.$emit('blur', this.instance);
+                });
                 this.instance.on('focus', () => {
-                    this.$emit('focus', this.instance)
-                })
+                    this.$emit('focus', this.instance);
+                });
             }
         },
-        beforeDestroy () {
+        beforeDestroy() {
             if (!this.destroyed) {
-                this.instance.focusManager.blur(true)
-                this.instance.removeAllListeners()
+                this.instance.focusManager.blur(true);
+                this.instance.removeAllListeners();
                 try {
-                    this.instance.destroy()
-                } catch (e) { }
-                this.destroyed = true
+                    this.instance.destroy();
+                } catch (e) {
+                }
+                this.destroyed = true;
             }
-        }
-    }
+        },
+    };
 </script>
 <style>
     .ckeditor::after {
diff --git a/Themes/Adminlte/views/layouts/master.blade.php b/Themes/Adminlte/views/layouts/master.blade.php
index 9bc6fab11..a382b36b0 100644
--- a/Themes/Adminlte/views/layouts/master.blade.php
+++ b/Themes/Adminlte/views/layouts/master.blade.php
@@ -81,6 +81,7 @@
         locales: {!! json_encode(LaravelLocalization::getSupportedLocales()) !!},
         currentLocale: '{{ locale() }}',
         editor: '{{ $activeEditor }}',
+        ckeditorCustomConfig: '{{ config('asgard.core.core.ckeditor-config-file-path', '') }}',
         adminPrefix: '{{ config('asgard.core.core.admin-prefix') }}',
         hideDefaultLocaleInURL: '{{ config('laravellocalization.hideDefaultLocaleInURL') }}',
         filesystem: '{{ config('asgard.media.config.filesystem') }}'

From 366b4a25f9824ee998428564a974496543ebace2 Mon Sep 17 00:00:00 2001
From: Micheal Mand <micheal@kmdwebdesigns.com>
Date: Wed, 14 Nov 2018 11:02:04 -0700
Subject: [PATCH 2/2] Remove ckeditor class because jQuery tries to replace

Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>
---
 Modules/Core/Assets/js/components/CkEditor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Modules/Core/Assets/js/components/CkEditor.vue b/Modules/Core/Assets/js/components/CkEditor.vue
index 68cf62e9d..3816d9d88 100644
--- a/Modules/Core/Assets/js/components/CkEditor.vue
+++ b/Modules/Core/Assets/js/components/CkEditor.vue
@@ -5,7 +5,6 @@
         :value="value"
         :types="types"
         :config="config"
-        class="ckeditor"
     ></textarea>
 </template>