Using marked instead of markdown

This commit is contained in:
Anh Hong 2020-05-13 13:14:39 +07:00 committed by hong4rc
parent 38a04bdae5
commit d01271e654
6 changed files with 12 additions and 24 deletions

View file

@ -41,7 +41,7 @@
"flux": "^3.1.3", "flux": "^3.1.3",
"jquery": "^3.4.0", "jquery": "^3.4.0",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"markdown": "^0.5.0", "marked": "^1.0.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"q": "^1.5.1", "q": "^1.5.1",
"raphael": "^2.1.0", "raphael": "^2.1.0",

View file

@ -30,7 +30,7 @@ var toGlobalize = {
Level: require('../level'), Level: require('../level'),
Sandbox: require('../sandbox/'), Sandbox: require('../sandbox/'),
GitDemonstrationView: require('../views/gitDemonstrationView'), GitDemonstrationView: require('../views/gitDemonstrationView'),
Markdown: require('markdown'), Markdown: require('marked'),
LevelDropdownView: require('../views/levelDropdownView'), LevelDropdownView: require('../views/levelDropdownView'),
BuilderViews: require('../views/builderViews'), BuilderViews: require('../views/builderViews'),
Util: require('../util/index'), Util: require('../util/index'),
@ -59,4 +59,3 @@ $(document).ready(function() {
return toGlobalize.Main.getSandbox().mainVis.gitEngine.printAndCopyTree(); return toGlobalize.Main.getSandbox().mainVis.gitEngine.printAndCopyTree();
}; };
}); });

View file

@ -1,5 +1,6 @@
var _ = require('underscore'); var _ = require('underscore');
var Q = require('q'); var Q = require('q');
var marked = require('marked');
var Views = require('../views'); var Views = require('../views');
var throttle = require('../util/throttle'); var throttle = require('../util/throttle');
@ -122,7 +123,7 @@ var MarkdownGrabber = ContainedBase.extend({
updatePreview: function() { updatePreview: function() {
var raw = this.getRawText(); var raw = this.getRawText();
var HTML = require('markdown').markdown.toHTML(raw); var HTML = marked(raw);
this.$('div.insidePreview').html(HTML); this.$('div.insidePreview').html(HTML);
} }
}); });

View file

@ -1,6 +1,7 @@
var _ = require('underscore'); var _ = require('underscore');
var Q = require('q'); var Q = require('q');
var Backbone = require('backbone'); var Backbone = require('backbone');
var marked = require('marked');
var util = require('../util'); var util = require('../util');
var intl = require('../intl'); var intl = require('../intl');
@ -43,7 +44,7 @@ var GitDemonstrationView = ContainedBase.extend({
); );
var convert = function(markdowns) { var convert = function(markdowns) {
return require('markdown').markdown.toHTML(markdowns.join('\n')); return marked(markdowns.join('\n'));
}; };
this.JSON.beforeHTML = convert(this.JSON.beforeMarkdowns); this.JSON.beforeHTML = convert(this.JSON.beforeMarkdowns);

View file

@ -1,6 +1,7 @@
var _ = require('underscore'); var _ = require('underscore');
var Q = require('q'); var Q = require('q');
var Backbone = require('backbone'); var Backbone = require('backbone');
var marked = require('marked');
var Main = require('../app'); var Main = require('../app');
var intl = require('../intl'); var intl = require('../intl');
@ -356,7 +357,7 @@ var ModalAlert = ContainedBase.extend({
render: function() { render: function() {
var HTML = (this.JSON.markdown) ? var HTML = (this.JSON.markdown) ?
require('markdown').markdown.toHTML(this.JSON.markdown) : marked(this.JSON.markdown) :
this.template(this.JSON); this.template(this.JSON);
// one more hack -- allow adding custom random HTML if specified // one more hack -- allow adding custom random HTML if specified
if (this.options._dangerouslyInsertHTML) { if (this.options._dangerouslyInsertHTML) {

View file

@ -202,11 +202,6 @@ JSONStream@^1.0.3:
jsonparse "^1.2.0" jsonparse "^1.2.0"
through ">=2.2.7 <3" through ">=2.2.7 <3"
abbrev@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1: acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1:
version "1.8.2" version "1.8.2"
resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
@ -3065,12 +3060,10 @@ map-visit@^1.0.0:
dependencies: dependencies:
object-visit "^1.0.0" object-visit "^1.0.0"
markdown@^0.5.0: marked@^1.0.0:
version "0.5.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/markdown/-/markdown-0.5.0.tgz#28205b565a8ae7592de207463d6637dc182722b2" resolved "https://registry.yarnpkg.com/marked/-/marked-1.0.0.tgz#d35784245a04871e5988a491e28867362e941693"
integrity sha1-KCBbVlqK51kt4gdGPWY33BgnIrI= integrity sha512-Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng==
dependencies:
nopt "~2.1.1"
matchdep@^2.0.0: matchdep@^2.0.0:
version "2.0.0" version "2.0.0"
@ -3305,13 +3298,6 @@ node-fetch@^1.0.1:
encoding "^0.1.11" encoding "^0.1.11"
is-stream "^1.0.1" is-stream "^1.0.1"
nopt@~2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.1.2.tgz#6cccd977b80132a07731d6e8ce58c2c8303cf9af"
integrity sha1-bMzZd7gBMqB3MdbozljCyDA8+a8=
dependencies:
abbrev "1"
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
version "2.5.0" version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"