Skip to content

[FIX] Highlight freezing the UI #16378

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

Merged
ggazzo merged 5 commits into from
Jan 30, 2020
Merged

[FIX] Highlight freezing the UI #16378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff39030
Fix Highlight freezing the frontent
MartinSchoeler Jan 29, 2020
1993c36
Merge remote-tracking branch 'origin/develop' into fix-hljs
MartinSchoeler Jan 29, 2020
c3111aa
fix tests
MartinSchoeler Jan 29, 2020
bb675ab
Fix tests
MartinSchoeler Jan 29, 2020
47239b5
update lock
MartinSchoeler Jan 29, 2020
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
371 changes: 371 additions & 0 deletions app/markdown/lib/hljs.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/markdown/lib/parser/marked/marked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Random } from 'meteor/random';
import _ from 'underscore';
import s from 'underscore.string';
import hljs from 'highlight.js';
import _marked from 'marked';

import hljs from '../../hljs';
import { settings } from '../../../../settings';

const renderer = new _marked.Renderer();
Expand Down
3 changes: 2 additions & 1 deletion app/markdown/lib/parser/original/code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
*/
import { Random } from 'meteor/random';
import s from 'underscore.string';
import hljs from 'highlight.js';

import hljs from '../../hljs';

const inlinecode = (message) => {
// Support `text`
Expand Down
8 changes: 4 additions & 4 deletions app/markdown/tests/client.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ const inlinecode = {

const code = {
'```code```': codeWrapper('<span class="hljs-keyword">code</span>', 'clean'),
'```code': codeWrapper('<span class="hljs-selector-tag">code</span>\n', 'stylus'),
'```code\n': codeWrapper('<span class="hljs-selector-tag">code</span>\n', 'stylus'),
'```\ncode\n```': codeWrapper('<span class="hljs-selector-tag">code</span>\n', 'stylus'),
'```code\n```': codeWrapper('<span class="hljs-selector-tag">code</span>\n', 'stylus'),
'```code': codeWrapper('<span class="hljs-keyword">code</span>\n', 'clean'),
'```code\n': codeWrapper('<span class="hljs-keyword">code</span>\n', 'clean'),
'```\ncode\n```': codeWrapper('<span class="hljs-keyword">code</span>\n', 'clean'),
'```code\n```': codeWrapper('<span class="hljs-keyword">code</span>\n', 'clean'),
'```\ncode```': codeWrapper('<span class="hljs-keyword">code</span>', 'clean'),
'```javascript\nvar a = \'log\';\nconsole.log(a);```': codeWrapper('<span class="hljs-keyword">var</span> a = <span class="hljs-string">\'log\'</span>;\n<span class="hljs-built_in">console</span>.log(a);', 'javascript'),
'```*code*```': codeWrapper('*<span class="hljs-meta">code</span>*', 'armasm'),
Expand Down
2 changes: 1 addition & 1 deletion client/startup/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Session } from 'meteor/session';
import { TimeSync } from 'meteor/mizzao:timesync';
import { UserPresence } from 'meteor/konecty:user-presence';
import toastr from 'toastr';
import hljs from 'highlight.js';

import hljs from '../../app/markdown/lib/hljs';
import { fireGlobalEvent } from '../../app/ui-utils';
import { getUserPreference } from '../../app/utils';
import 'highlight.js/styles/github.css';
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"grapheme-splitter": "^1.0.4",
"gridfs-stream": "^1.1.1",
"he": "^1.2.0",
"highlight.js": "^9.13.1",
"highlight.js": "^9.18.0",
"iconv-lite": "^0.4.24",
"image-size": "^0.6.3",
"imap": "^0.8.19",
Expand Down