From b9be0f153af789b60de116da6dab6ecb1cbf85d7 Mon Sep 17 00:00:00 2001
From: "Phu.Nguyen" <Phu.Nguyen@altsrc.net>
Date: Tue, 24 Nov 2020 10:47:01 +0700
Subject: [PATCH 1/2] fix clear format

---
 src/editor/Editr.vue               | 8 +++++---
 src/editor/locales/index.js        | 2 +-
 src/editor/modules/image.vue       | 3 ++-
 src/editor/modules/removeFormat.js | 7 ++++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/editor/Editr.vue b/src/editor/Editr.vue
index 74e5b02..828dc5c 100644
--- a/src/editor/Editr.vue
+++ b/src/editor/Editr.vue
@@ -160,11 +160,13 @@ export default {
             }
           }
         },
-        exec (cmd, arg, sel){
+        exec (cmd, arg, sel, clearSelectionAfter){
             sel !== false && this.selection && this.restoreSelection(this.selection);
             document.execCommand(cmd, false, arg||"");
-            this.clearSelection();
-
+            if (clearSelectionAfter !== false) {
+                this.clearSelection();
+            }
+            
             this.$nextTick(this.emit);
         },
 
diff --git a/src/editor/locales/index.js b/src/editor/locales/index.js
index 6643034..5953262 100644
--- a/src/editor/locales/index.js
+++ b/src/editor/locales/index.js
@@ -8,7 +8,7 @@ import spanish from "./spanish";
 export default {
     dutch,
     hungarian,
-    german,
+    italian,
     english,
     portuguese,
     spanish,
diff --git a/src/editor/modules/image.vue b/src/editor/modules/image.vue
index 03bdad4..8e11e96 100644
--- a/src/editor/modules/image.vue
+++ b/src/editor/modules/image.vue
@@ -12,7 +12,8 @@
 <script>
 import Dropzone from 'vue2-dropzone';
 import bus from 'src/editor/bus.js';
-import 'vue2-dropzone/dist/vue2Dropzone.css'
+// wont compile
+// import 'vue2-dropzone/dist/vue2Dropzone.css'
 
 const UPLOAD_ICON = '<svg fill="#666" width="26" height="24" viewBox="0 0 2048 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1344 864q0-14-9-23l-352-352q-9-9-23-9t-23 9l-351 351q-10 12-10 24 0 14 9 23t23 9h224v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5-9.5t9.5-22.5v-352h224q13 0 22.5-9.5t9.5-22.5zm640 288q0 159-112.5 271.5t-271.5 112.5h-1088q-185 0-316.5-131.5t-131.5-316.5q0-130 70-240t188-165q-2-30-2-43 0-212 150-362t362-150q156 0 285.5 87t188.5 231q71-62 166-62 106 0 181 75t75 181q0 76-41 138 130 31 213.5 135.5t83.5 238.5z"/></svg>'
 
diff --git a/src/editor/modules/removeFormat.js b/src/editor/modules/removeFormat.js
index 39896e2..229b334 100644
--- a/src/editor/modules/removeFormat.js
+++ b/src/editor/modules/removeFormat.js
@@ -1,6 +1,11 @@
 module.exports = {
 	title: "removeFormat",
-	action: ["removeFormat"],
+    customAction (utils) {
+        return [
+            ["removeFormat", undefined, true, false],
+            ["formatBlock", "p"]
+        ]
+    },
 	description: "Remove formatting.\nClears headings, bold, italic, underlined text, etc.",
 	icon: '<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M832 1408l336-384h-768l-336 384h768zm1013-1077q15 34 9.5 71.5t-30.5 65.5l-896 1024q-38 44-96 44h-768q-38 0-69.5-20.5t-47.5-54.5q-15-34-9.5-71.5t30.5-65.5l896-1024q38-44 96-44h768q38 0 69.5 20.5t47.5 54.5z"/></svg>'
 }

From 9dfbcdc1ea5c3bc9eefabbd8ad1da99fd0872355 Mon Sep 17 00:00:00 2001
From: "Phu.Nguyen" <Phu.Nguyen@altsrc.net>
Date: Wed, 25 Nov 2020 10:18:31 +0700
Subject: [PATCH 2/2] fix to german

---
 src/editor/locales/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/editor/locales/index.js b/src/editor/locales/index.js
index 5953262..eeecb37 100644
--- a/src/editor/locales/index.js
+++ b/src/editor/locales/index.js
@@ -2,13 +2,13 @@ import dutch from "./dutch";
 import hungarian from "./hungarian";
 import english from "./english";
 import portuguese from "./portuguese";
-import italian from "./italian";
+import german from './german';
 import spanish from "./spanish";
 
 export default {
     dutch,
     hungarian,
-    italian,
+    german,
     english,
     portuguese,
     spanish,