Implement R code highlight (#5102)

* Initial implement code highlight * using local js src * Code highlighting in help docs * style changes * Fix code highlight in dark mode
jasp-stats · Jun 13, 2023 · 999863b · 999863b
1 parent 965dd04
commit 999863b
Show file tree

Hide file tree

Showing 12 changed files with 4,081 additions and 1,144 deletions.
diff --git a/Desktop/html/css/darkTheme-jasp.css b/Desktop/html/css/darkTheme-jasp.css
@@ -206,6 +206,15 @@ div.jasp-image-image.no-data.error {
     background-color: #555
 }
 
+/* to fix code highlight in dark theme*/
+.jasp-rsyntax-container .hljs {
+  background: #555;
+  color:  	#FFFFFF;
+}
+.jasp-rsyntax-container .hljs-string {
+  color:  	#bd93f9;
+}
+
 
 /* Track */
 ::-webkit-scrollbar-track {

diff --git a/Desktop/html/css/highlight-default.min.css b/Desktop/html/css/highlight-default.min.css
diff --git a/Desktop/html/css/lightTheme-jasp.css b/Desktop/html/css/lightTheme-jasp.css
@@ -211,7 +211,7 @@ div.jasp-image-image.no-data.error {
 }
 
 .jasp-rsyntax-container {
-    background-color: rgb(235, 235, 235);
+    background-color: #f3f3f3;
 }
 
 /* Track */

diff --git a/Desktop/html/css/quill.snow.css b/Desktop/html/css/quill.snow.css
@@ -1,4 +1,5 @@
 /*!
+ *
  * Quill Editor v1.3.1
  * https://quilljs.com/
  * Copyright (c) 2014, Jason Chen

diff --git a/Desktop/html/index-jasp.html b/Desktop/html/index-jasp.html
@@ -12,6 +12,7 @@
 	<link rel="stylesheet" href="css/jasp.css"								type="text/css"/>
 	<link rel="stylesheet" href="css/lightTheme-jasp.css"					type="text/css" id="style"/>
 	<link rel="stylesheet" href="css/printing.css"							type="text/css" />
+	<link rel="stylesheet" href="css/highlight-default.min.css"				type="text/css" />
 
 	<script type="text/javascript" >   var insideJASP = true;               </script>
 
@@ -20,6 +21,8 @@
 	<script type="text/javascript" src="js/underscore-min.js">            </script>
 	<script type="text/javascript" src="js/backbone-1.1.2.js">           </script>
 	<script type="text/javascript" src="js/etch.js">                    </script>
+	<script type="text/javascript" src="js/highlight.min.js">           </script>
+	<script type="text/javascript" src="js/highlight-r.min.js">        </script>
 	<script type="text/javascript" src="js/quill.js">                  </script>
 	<script type="text/javascript" src="js/mrkdwn.js">                </script>
 	<script type="text/javascript" src="js/jaspwidgets.js">          </script>

diff --git a/Desktop/html/index.html b/Desktop/html/index.html
@@ -12,13 +12,16 @@
     <link rel="stylesheet" href="css/jasp.css"					            type="text/css"/>
     <link rel="stylesheet" href="css/lightTheme-jasp.css"					type="text/css" id="style"/>
     <link rel="stylesheet" href="css/printing.css"							type="text/css" />
-
+	<link rel="stylesheet" href="css/highlight-default.min.css"				type="text/css" />
+
     <script type="text/javascript" >   var insideJASP = false;  </script>
 
     <script type="text/javascript" src="js/jquery-1.9.1.js">                </script>
 	<script type="text/javascript" src="js/jquery-ui-1.10.1.custom.js">    </script>
 	<script type="text/javascript" src="js/underscore-min.js">            </script>
 	<script type="text/javascript" src="js/backbone-1.1.2.js">           </script>
+	<script type="text/javascript" src="js/highlight.min.js">           </script>
+	<script type="text/javascript" src="js/highlight-r.min.js">        </script>
 	<script type="text/javascript" src="js/mrkdwn.js">                </script>
 	<script type="text/javascript" src="js/jaspwidgets.js">          </script>
 	<script type="text/javascript" src="js/object.js">              </script>

diff --git a/Desktop/html/js/highlight-r.min.js b/Desktop/html/js/highlight-r.min.js