codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 19:08:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2204 from ligthyear/fix-autohighlight

Browse source 
Enable autohighlighting of highlight.js for all code blocks
This commit is contained in:
Régis Hanol 2014-03-31 10:16:19 +02:00
commit 97da6e7bd7
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/lib/syntax_highlighting.js
View file

@ -16,7 +16,8 @@ Discourse.SyntaxHighlighting = {
@param {jQuery.selector} $elem The element we want to apply our highlighting to @param {jQuery.selector} $elem The element we want to apply our highlighting to
**/ **/
apply: function($elem) { apply: function($elem) {
$('pre code[class]', $elem).each(function(i, e) { var selector = Discourse.SiteSettings.autohighlight_all_code ? 'pre code' : 'pre code[class]';
$(selector, $elem).each(function(i, e) {
return $LAB.script("/javascripts/highlight.pack.js").wait(function() { return $LAB.script("/javascripts/highlight.pack.js").wait(function() {
return hljs.highlightBlock(e); return hljs.highlightBlock(e);
}); });

1
config/locales/server.en.yml
View file

@ -856,6 +856,7 @@ en:
short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value." short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value."
default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)" default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)"
warn_reviving_old_topic_age: "When someone starts replying to a topic older than this many days, a warning will be displayed to discourage the user from reviving an old discussion. Disable by setting to 0." warn_reviving_old_topic_age: "When someone starts replying to a topic older than this many days, a warning will be displayed to discourage the user from reviving an old discussion. Disable by setting to 0."
autohighlight_all_code: "Apply code highlighting to all preformatted code blocks even when the didn't specify the language"
embeddable_host: "Host that can embed the comments from this Discourse forum" embeddable_host: "Host that can embed the comments from this Discourse forum"
feed_polling_enabled: "Whether to import a RSS/ATOM feed as posts" feed_polling_enabled: "Whether to import a RSS/ATOM feed as posts"

3
config/site_settings.yml
View file

@ -235,6 +235,9 @@ posting:
client: true client: true
default: "lang-auto" default: "lang-auto"
warn_reviving_old_topic_age: 180 warn_reviving_old_topic_age: 180
autohighlight_all_code:
client: true
default: false
email: email:
email_time_window_mins: 10 email_time_window_mins: 10