From 827bcbbe0b5a8db6b1da2f021d7fcc7e01b443fb Mon Sep 17 00:00:00 2001
From: David Evans <davidje13@users.noreply.github.com>
Date: Thu, 10 May 2018 20:32:52 +0100
Subject: [PATCH] Use local copies of code mirror plugins in dev mode

---
 bin/server.js                      |  1 +
 index.html                         | 68 +++++++++++++++++-------------
 web/styles/codemirror-override.css | 14 ++++++
 web/styles/editor.css              | 15 -------
 4 files changed, 54 insertions(+), 44 deletions(-)
 create mode 100644 web/styles/codemirror-override.css

diff --git a/bin/server.js b/bin/server.js
index 3ba7b08..e8ccec0 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -60,6 +60,7 @@ if(DEV) {
 	statics.addResources('/', BASEDIR, [
 		'node_modules/requirejs/require.js',
 		'node_modules/codemirror/lib',
+		'node_modules/codemirror/addon',
 		'scripts',
 		'web/scripts',
 	]);
diff --git a/index.html b/index.html
index 07c4853..feb6bd2 100644
--- a/index.html
+++ b/index.html
@@ -16,30 +16,12 @@
 ">
 <meta name="viewport" content="initial-scale=1.0, user-scalable=no, minimal-ui">
 <meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="default">
 <meta name="format-detection" content="telephone=no">
 
 <title>Sequence Diagram</title>
 <link rel="icon" href="web/resources/favicon.png">
 <link rel="apple-touch-icon" href="web/resources/apple-touch-icon.png">
-
-<!-- DEV
-<link rel="stylesheet" href="node_modules/codemirror/lib/codemirror.css">
-/DEV -->
-
-<!-- LIVE -->
-<link rel="stylesheet"
-	href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/codemirror.min.css"
-	integrity="sha256-I8NyGs4wjbMuBSUE40o55W6k6P7tu/7G28/JGUUYCIs="
-	crossorigin="anonymous"
->
-<!-- /LIVE -->
-
-<link rel="stylesheet"
-	href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/addon/hint/show-hint.min.css"
-	integrity="sha256-Ng5EdzHS/CC37tR7tE75e4Th9+fBvOB4eYITOkXS22Q="
-	crossorigin="anonymous"
->
-
 <link rel="stylesheet" href="web/styles/editor.css">
 
 <meta
@@ -53,6 +35,31 @@
 	name="cdn-cm/lib/codemirror"
 	content="node_modules/codemirror/lib/codemirror.js"
 >
+
+<link rel="stylesheet" href="node_modules/codemirror/lib/codemirror.css">
+
+<meta
+	name="cdn-cm/addon/hint/show-hint"
+	content="node_modules/codemirror/addon/hint/show-hint.js"
+>
+
+<link rel="stylesheet"
+	href="node_modules/codemirror/addon/hint/show-hint.css"
+>
+
+<meta
+	name="cdn-cm/addon/edit/trailingspace"
+	content="node_modules/codemirror/addon/edit/trailingspace.js"
+>
+
+<meta
+	name="cdn-cm/addon/comment/comment"
+	content="node_modules/codemirror/addon/comment/comment.js"
+>
+
+<script src="node_modules/requirejs/require.js"></script>
+<link rel="stylesheet" href="web/styles/codemirror-override.css">
+<script src="web/scripts/editor.mjs" type="module"></script>
 /DEV -->
 
 <!-- LIVE -->
@@ -61,7 +68,12 @@
 	content="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/codemirror.min.js"
 	data-integrity="sha256-U/4XQwZXDFDdAHjIZt1Lm7sFfmMiFDZzFYprq6XJ0gk="
 >
-<!-- /LIVE -->
+
+<link rel="stylesheet"
+	href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/codemirror.min.css"
+	integrity="sha256-I8NyGs4wjbMuBSUE40o55W6k6P7tu/7G28/JGUUYCIs="
+	crossorigin="anonymous"
+>
 
 <meta
 	name="cdn-cm/addon/hint/show-hint"
@@ -69,6 +81,12 @@
 	data-integrity="sha256-/Cxd7R7oycnq3vuRycj68ToCzdZ73tux8nSULZiWWK0="
 >
 
+<link rel="stylesheet"
+	href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/addon/hint/show-hint.min.css"
+	integrity="sha256-Ng5EdzHS/CC37tR7tE75e4Th9+fBvOB4eYITOkXS22Q="
+	crossorigin="anonymous"
+>
+
 <meta
 	name="cdn-cm/addon/edit/trailingspace"
 	content="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.37.0/addon/edit/trailingspace.min.js"
@@ -81,21 +99,13 @@
 	data-integrity="sha256-xRNygSqAYMT9wcso0FgZEY3ROGoD6JdvYd8M9IjSuNg="
 >
 
-<!-- DEV
-<script
-	src="node_modules/requirejs/require.js"
-	crossorigin="anonymous"
-></script>
-<script src="web/scripts/editor.mjs" type="module"></script>
-/DEV -->
-
-<!-- LIVE -->
 <script src="lib/sequence-diagram-web.min.js"></script>
 <script
 	src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"
 	integrity="sha256-0SGl1PJNDyJwcV5T+weg2zpEMrh7xvlwO4oXgvZCeZk="
 	crossorigin="anonymous"
 ></script>
+<link rel="stylesheet" href="web/styles/codemirror-override.css">
 <script src="web/lib/editor.min.js"></script>
 <!-- /LIVE -->
 
diff --git a/web/styles/codemirror-override.css b/web/styles/codemirror-override.css
new file mode 100644
index 0000000..3eb6493
--- /dev/null
+++ b/web/styles/codemirror-override.css
@@ -0,0 +1,14 @@
+.CodeMirror-line.error {
+	background: rgba(255, 0, 0, 0.2);
+}
+
+.cm-s-default .cm-keyword  {color: #0055CC;}
+.cm-s-default .cm-variable {color: #AA5500;}
+.cm-s-default .cm-operator {color: #0055CC;}
+.cm-s-default .cm-comment  {color: #558800;}
+.cm-s-default .cm-string   {color: #221111;}
+.cm-s-default .cm-error    {color: #FF0000;}
+
+.cm-s-default .cm-trailingspace {
+	background: rgba(255, 0, 0, 0.2);
+}
diff --git a/web/styles/editor.css b/web/styles/editor.css
index 9c3ef99..9f088eb 100644
--- a/web/styles/editor.css
+++ b/web/styles/editor.css
@@ -133,21 +133,6 @@ html, body {
 	white-space: pre;
 }
 
-.CodeMirror-line.error {
-	background: rgba(255, 0, 0, 0.2);
-}
-
-.cm-s-default .cm-keyword  {color: #0055CC;}
-.cm-s-default .cm-variable {color: #AA5500;}
-.cm-s-default .cm-operator {color: #0055CC;}
-.cm-s-default .cm-comment  {color: #558800;}
-.cm-s-default .cm-string   {color: #221111;}
-.cm-s-default .cm-error    {color: #FF0000;}
-
-.cm-s-default .cm-trailingspace {
-	background: rgba(255, 0, 0, 0.2);
-}
-
 .param {
 	border: 1px solid #CC0000;
 	margin: -1px;