Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: properly whitelist <code> classes needed for syntax highlighting

This commit is contained in:
Régis Hanol 2014-07-09 16:27:47 +02:00
parent 9ffcbfca98
commit 6b45b635f8
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/lib/markdown.js
View File

@ -1,4 +1,4 @@
/*global Markdown:true BetterMarkdown:true */ /*global Markdown:true, hljs:true */
/** /**
Contains methods to help us with markdown formatting. Contains methods to help us with markdown formatting.
@ -226,6 +226,7 @@ Discourse.Markdown = {
} }
}; };
RSVP.EventTarget.mixin(Discourse.Markdown); RSVP.EventTarget.mixin(Discourse.Markdown);
Discourse.Markdown.whiteListTag('a', 'class', 'attachment'); Discourse.Markdown.whiteListTag('a', 'class', 'attachment');
@ -238,13 +239,13 @@ Discourse.Markdown.whiteListTag('a', 'data-bbcode');
Discourse.Markdown.whiteListTag('div', 'class', 'title'); Discourse.Markdown.whiteListTag('div', 'class', 'title');
Discourse.Markdown.whiteListTag('div', 'class', 'quote-controls'); Discourse.Markdown.whiteListTag('div', 'class', 'quote-controls');
// FIXME: explicitly whitelist classes we need allowed through for // explicitly whitelist classes we need allowed through for
// syntax highlighting, grab from highlight.js // syntax highlighting, grabbed from highlight.js
hljs.listLanguages().forEach(function (language) {
Discourse.Markdown.whiteListTag('code', 'class', language);
});
Discourse.Markdown.whiteListTag('code', 'class', 'text'); Discourse.Markdown.whiteListTag('code', 'class', 'text');
Discourse.Markdown.whiteListTag('code', 'class', 'ruby');
Discourse.Markdown.whiteListTag('code', 'class', 'json');
Discourse.Markdown.whiteListTag('code', 'class', 'lang-auto'); Discourse.Markdown.whiteListTag('code', 'class', 'lang-auto');
// Discourse.Markdown.whiteListTag('code', 'class', '*');
Discourse.Markdown.whiteListTag('span', 'class', 'mention'); Discourse.Markdown.whiteListTag('span', 'class', 'mention');
Discourse.Markdown.whiteListTag('span', 'class', 'spoiler'); Discourse.Markdown.whiteListTag('span', 'class', 'spoiler');

2
app/assets/javascripts/main_include.js
View File

@ -5,6 +5,8 @@
// Pagedown customizations // Pagedown customizations
//= require ./pagedown_custom.js //= require ./pagedown_custom.js
//= require highlight.pack.js
// Stuff we need to load first // Stuff we need to load first
//= require ./discourse/mixins/scrolling //= require ./discourse/mixins/scrolling
//= require_tree ./discourse/mixins //= require_tree ./discourse/mixins

2
config/application.rb
View File

@ -49,7 +49,7 @@ module Discourse
# :all can be used as a placeholder for all plugins not explicitly named. # :all can be used as a placeholder for all plugins not explicitly named.
# config.plugins = [ :exception_notification, :ssl_requirement, :all ] # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
config.assets.paths += %W(#{config.root}/config/locales) config.assets.paths += %W(#{config.root}/config/locales #{config.root}/public/javascripts)
# explicitly precompile any images in plugins ( /assets/images ) path # explicitly precompile any images in plugins ( /assets/images ) path
config.assets.precompile += [lambda do |filename, path| config.assets.precompile += [lambda do |filename, path|

2
public/javascripts/highlight.pack.js
View File

File diff suppressed because one or more lines are too long

6
test/javascripts/test_helper.js
View File

@ -21,9 +21,11 @@
// Pagedown customizations // Pagedown customizations
//= require ../../app/assets/javascripts/pagedown_custom.js //= require ../../app/assets/javascripts/pagedown_custom.js
//
//= require ../../public/javascripts/highlight.pack.js
//= require vendor //= require vendor
//
//= require htmlparser.js //= require htmlparser.js
// Stuff we need to load first // Stuff we need to load first