Upgrade CodeMirror

closes #2108 - upgrade to 4.0.1 - requires removing the deprecated setLine method
TryGhost · Mar 17, 2014 · 6d3cd84 · 6d3cd84
1 parent 80bdfd7
commit 6d3cd84
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
     "name": "ghost",
     "dependencies": {
         "backbone": "1.0.0",
-        "codemirror": "3.15.0",
+        "codemirror": "4.0.1",
         "Countable": "2.0.2",
         "fastclick": "1.0.0",
         "ghost-ui": "0.1.2",

diff --git a/core/client/assets/lib/editor/markerManager.js b/core/client/assets/lib/editor/markerManager.js
@@ -45,8 +45,15 @@
         // ln - line number
         addMarker = function (line, ln) {
             var marker,
-                magicId = '{<' + uploadId + '>}';
-            editor.setLine(ln, magicId + line.text);
+                magicId = '{<' + uploadId + '>}',
+                newText = magicId + line.text;
+
+            editor.replaceRange(
+                newText,
+                {line: ln, ch: 0},
+                {line: ln, ch: newText.length}
+            );
+
             marker = editor.markText(
                 {line: ln, ch: 0},
                 {line: ln, ch: (magicId.length)},