added diff merge

w8tcha · Nov 28, 2021 · 3f69534 · 3f69534
1 parent af8bb02
commit 3f69534
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -255,6 +255,12 @@ module.exports = function(grunt) {
                     "codemirror/js/codemirror.min.js",
                 ],
                 dest: "codemirror/js/codemirror.min.js"
+            },
+			mergeAddon: {
+                src: [
+                    "codemirror/js/addon/merge/merge.js",
+                ],
+                dest: "codemirror/js/codemirror.addon.merge.min.js"
             },
             modeBBCode: {
                 src: [
@@ -303,6 +309,7 @@ module.exports = function(grunt) {
                             "codemirror/js/addon/dialog/dialog.css",
                             "codemirror/js/addon/hint/show-hint.css",
                             "codemirror/js/addon/fold/foldgutter.css",
+                            "codemirror/js/addon/merge/merge.css",
                             "codemirror/js/addon/search/matchesonscrollbar.css"
                         ],
                         dest: "codemirror/css/codemirror.min.css"

diff --git a/codemirror/css/codemirror.ckeditor.css b/codemirror/css/codemirror.ckeditor.css
@@ -194,4 +194,8 @@
 	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
 	background-position: bottom left;
 	background-repeat: repeat-x;
-}
+}
+
+.CodeMirror-merge-editor {
+	position: absolute;
+	left: 0;
diff --git a/codemirror/css/codemirror.min.css b/codemirror/css/codemirror.min.css
diff --git a/codemirror/js/codemirror.addon.merge.min.js b/codemirror/js/codemirror.addon.merge.min.js