From 261d2fecbcc25e11fcb9981a1c896f7fd0cda0dd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 29 Sep 2016 16:23:27 +0200
Subject: [PATCH] Get codemirror from bower and use that version in the code
 app

---
 bower.json          |  1 +
 www/code/inner.html | 48 ++++++++++++++++++++++-----------------------
 www/code/main.js    |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/bower.json b/bower.json
index fef2e7adb..c26a379ef 100644
--- a/bower.json
+++ b/bower.json
@@ -21,6 +21,7 @@
     "jquery": "~2.1.3",
     "tweetnacl": "~0.12.2",
     "ckeditor": "~4.5.6",
+    "codemirror": "^5.19.0",
     "requirejs": "~2.1.15",
     "reconnectingWebsocket": "",
     "marked": "~0.3.5",
diff --git a/www/code/inner.html b/www/code/inner.html
index 1a7222d76..970171ef0 100644
--- a/www/code/inner.html
+++ b/www/code/inner.html
@@ -4,32 +4,32 @@
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="codemirror-5.16.0/lib/codemirror.js"></script>
-    <link rel="stylesheet" href="codemirror-5.16.0/lib/codemirror.css">
-    <link rel="stylesheet" href="codemirror-5.16.0/addon/dialog/dialog.css">
-    <link rel="stylesheet" href="codemirror-5.16.0/addon/fold/foldgutter.css" />
-    <script src="codemirror-5.16.0/mode/javascript/javascript.js"></script>
-    <script src="codemirror-5.16.0/mode/loadmode.js"></script>
-    <script src="codemirror-5.16.0/mode/meta.js"></script>
+    <script src="/bower_components/codemirror/lib/codemirror.js"></script>
+    <link rel="stylesheet" href="/bower_components/codemirror/lib/codemirror.css">
+    <link rel="stylesheet" href="/bower_components/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="/bower_components/codemirror/addon/fold/foldgutter.css" />
+    <script src="/bower_components/codemirror/mode/javascript/javascript.js"></script>
+    <script src="/bower_components/codemirror/addon/mode/loadmode.js"></script>
+    <script src="/bower_components/codemirror/mode/meta.js"></script>
 
-    <script src="codemirror-5.16.0/addon/mode/overlay.js"></script>
-    <script src="codemirror-5.16.0/addon/mode/multiplex.js"></script>
-    <script src="codemirror-5.16.0/addon/mode/simple.js"></script>
+    <script src="/bower_components/codemirror/addon/mode/overlay.js"></script>
+    <script src="/bower_components/codemirror/addon/mode/multiplex.js"></script>
+    <script src="/bower_components/codemirror/addon/mode/simple.js"></script>
 
-    <script src="codemirror-5.16.0/addon/edit/closebrackets.js"></script>
-    <script src="codemirror-5.16.0/addon/edit/matchbrackets.js"></script>
-    <script src="codemirror-5.16.0/addon/edit/trailingspace.js"></script>
-    <script src="codemirror-5.16.0/addon/selection/active-line.js"></script>
-    <script src="codemirror-5.16.0/addon/search/search.js"></script>
-    <script src="codemirror-5.16.0/addon/search/match-highlighter.js"></script>
-    <script src="codemirror-5.16.0/addon/search/searchcursor.js"></script>
-    <script src="codemirror-5.16.0/addon/dialog/dialog.js"></script>
-    <script src="codemirror-5.16.0/addon/fold/foldcode.js"></script>
-    <script src="codemirror-5.16.0/addon/fold/foldgutter.js"></script>
-    <script src="codemirror-5.16.0/addon/fold/brace-fold.js"></script>
-    <script src="codemirror-5.16.0/addon/fold/xml-fold.js"></script>
-    <script src="codemirror-5.16.0/addon/fold/markdown-fold.js"></script>
-    <script src="codemirror-5.16.0/addon/fold/comment-fold.js"></script>
+    <script src="/bower_components/codemirror/addon/edit/closebrackets.js"></script>
+    <script src="/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="/bower_components/codemirror/addon/edit/trailingspace.js"></script>
+    <script src="/bower_components/codemirror/addon/selection/active-line.js"></script>
+    <script src="/bower_components/codemirror/addon/search/search.js"></script>
+    <script src="/bower_components/codemirror/addon/search/match-highlighter.js"></script>
+    <script src="/bower_components/codemirror/addon/search/searchcursor.js"></script>
+    <script src="/bower_components/codemirror/addon/dialog/dialog.js"></script>
+    <script src="/bower_components/codemirror/addon/fold/foldcode.js"></script>
+    <script src="/bower_components/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="/bower_components/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="/bower_components/codemirror/addon/fold/xml-fold.js"></script>
+    <script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
+    <script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
     <style>
       html {
         height: 100%;
diff --git a/www/code/main.js b/www/code/main.js
index 244034f99..60f5deea3 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -45,7 +45,7 @@ define([
 
         var andThen = function (CMeditor) {
             var CodeMirror = module.CodeMirror = CMeditor;
-            CodeMirror.modeURL = "/code/codemirror-5.16.0/mode/%N/%N.js";
+            CodeMirror.modeURL = "/bower_components/codemirror/mode/%N/%N.js";
 
             var $pad = $('#pad-iframe');
             var $textarea = $pad.contents().find('#editor1');