Post highlighter tweaks (#5663)

* dont use modules for ext * dont highlight R commander output window * add highlighter back to R command output window
jasp-stats · Sep 30, 2024 · d26c0d4 · d26c0d4
1 parent e80ff5f
commit d26c0d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/Desktop/components/JASP/Widgets/RCommanderWindow.qml b/Desktop/components/JASP/Widgets/RCommanderWindow.qml
@@ -109,12 +109,7 @@ Window
 					width:		outputScroll.width
 
 					TextArea
-					{
-						RSyntaxHighlighterQuick
-						{
-							textDocument:		outputWindow.textDocument
-						}
-
+					{					
 						id:					outputWindow
 						text:				rCmd.output
 						font:				jaspTheme.fontRCode
@@ -125,6 +120,11 @@ Window
 						selectByMouse:		true
 						readOnly:			true
 
+						RSyntaxHighlighterQuick
+						{
+							textDocument:		outputWindow.textDocument
+						}
+
 						anchors
 						{
 							left:		parent.left

diff --git a/Resources/Help/marked-hljs-ext.js b/Resources/Help/marked-hljs-ext.js
@@ -3,11 +3,6 @@
  * MIT Licensed
  * https://github.com/markedjs/marked-highlight
  */
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-  typeof define === 'function' && define.amd ? define(['exports'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.markedHighlight = {}));
-})(this, (function (exports) { 'use strict';
 
   function markedHighlight(options) {
     if (typeof options === 'function') {
@@ -102,7 +97,3 @@
 
     return html;
   }
-
-  exports.markedHighlight = markedHighlight;
-
-}));