mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 16:38:50 +02:00
Using marked
instead of markdown
This commit is contained in:
parent
38a04bdae5
commit
d01271e654
6 changed files with 12 additions and 24 deletions
|
@ -30,7 +30,7 @@ var toGlobalize = {
|
|||
Level: require('../level'),
|
||||
Sandbox: require('../sandbox/'),
|
||||
GitDemonstrationView: require('../views/gitDemonstrationView'),
|
||||
Markdown: require('markdown'),
|
||||
Markdown: require('marked'),
|
||||
LevelDropdownView: require('../views/levelDropdownView'),
|
||||
BuilderViews: require('../views/builderViews'),
|
||||
Util: require('../util/index'),
|
||||
|
@ -59,4 +59,3 @@ $(document).ready(function() {
|
|||
return toGlobalize.Main.getSandbox().mainVis.gitEngine.printAndCopyTree();
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
var _ = require('underscore');
|
||||
var Q = require('q');
|
||||
var marked = require('marked');
|
||||
|
||||
var Views = require('../views');
|
||||
var throttle = require('../util/throttle');
|
||||
|
@ -122,7 +123,7 @@ var MarkdownGrabber = ContainedBase.extend({
|
|||
|
||||
updatePreview: function() {
|
||||
var raw = this.getRawText();
|
||||
var HTML = require('markdown').markdown.toHTML(raw);
|
||||
var HTML = marked(raw);
|
||||
this.$('div.insidePreview').html(HTML);
|
||||
}
|
||||
});
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
var _ = require('underscore');
|
||||
var Q = require('q');
|
||||
var Backbone = require('backbone');
|
||||
var marked = require('marked');
|
||||
|
||||
var util = require('../util');
|
||||
var intl = require('../intl');
|
||||
|
@ -43,7 +44,7 @@ var GitDemonstrationView = ContainedBase.extend({
|
|||
);
|
||||
|
||||
var convert = function(markdowns) {
|
||||
return require('markdown').markdown.toHTML(markdowns.join('\n'));
|
||||
return marked(markdowns.join('\n'));
|
||||
};
|
||||
|
||||
this.JSON.beforeHTML = convert(this.JSON.beforeMarkdowns);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
var _ = require('underscore');
|
||||
var Q = require('q');
|
||||
var Backbone = require('backbone');
|
||||
var marked = require('marked');
|
||||
|
||||
var Main = require('../app');
|
||||
var intl = require('../intl');
|
||||
|
@ -356,7 +357,7 @@ var ModalAlert = ContainedBase.extend({
|
|||
|
||||
render: function() {
|
||||
var HTML = (this.JSON.markdown) ?
|
||||
require('markdown').markdown.toHTML(this.JSON.markdown) :
|
||||
marked(this.JSON.markdown) :
|
||||
this.template(this.JSON);
|
||||
// one more hack -- allow adding custom random HTML if specified
|
||||
if (this.options._dangerouslyInsertHTML) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue