Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post highlighter tweaks #5663

Merged
merged 3 commits into from
Sep 17, 2024
+6 −15
Merged

Post highlighter tweaks #5663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dbb26f
dont use modules for ext
shun2wang Sep 15, 2024
dec922c
dont highlight R commander output window
shun2wang Sep 15, 2024
801b9b8
add highlighter back to R command output window
shun2wang Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Desktop/components/JASP/Widgets/RCommanderWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,7 @@ Window
width: outputScroll.width

TextArea
{
RSyntaxHighlighterQuick
{
textDocument: outputWindow.textDocument
}

{
id: outputWindow
text: rCmd.output
font: jaspTheme.fontRCode
Expand All @@ -125,6 +120,11 @@ Window
selectByMouse: true
readOnly: true

RSyntaxHighlighterQuick
{
textDocument: outputWindow.textDocument
}

anchors
{
left: parent.left
Expand Down
9 changes: 0 additions & 9 deletions Resources/Help/marked-hljs-ext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -102,7 +97,3 @@

return html;
}

exports.markedHighlight = markedHighlight;

}));