History

Merge pull request #1064 from simon04/julia

Jasper van Merle committed 7 years ago

Commit 0fd990d2 parents c25865b 79260c26 files · +49 −6Browse files

Showing the changes to assets/javascripts (3 of 6 files). Show all

Unified · Split

3 files
  1. assets/javascripts/models/entry.coffee +1 −0
  2. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  3. assets/javascripts/vendor/prism.js +15 −1
assets/javascripts/models/entry.coffee+1−0
@@ -58,6 +58,7 @@ class app.models.Entry extends app.Model · 57 unmodified lines
5858 'crystal': 'cr'
5959 'elixir': 'ex'
6060 'javascript': 'js'
61+ 'julia': 'jl'
6162 'jquery': '$'
6263 'knockout.js': 'ko'
6364 'less': 'ls'
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -383,7 +383,7 @@ credits = [ · 382 unmodified lines
383383 'https://raw.githubusercontent.com/jquery/api.jqueryui.com/master/LICENSE.txt'
384384 ], [
385385 'Julia',
386− '2009-2018 Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors',
386+ '2009-2019 Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors',
387387 'MIT',
388388 'https://raw.githubusercontent.com/JuliaLang/julia/master/LICENSE.md'
389389 ], [
assets/javascripts/vendor/prism.js+15−1
@@ -1,5 +1,5 @@
11 /* PrismJS 1.17.1
2−https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+markup-templating+elixir+erlang+go+java+php+json+kotlin+crystal+lua+django+matlab+typescript+nginx+nim+perl+sql+scss+python+jsx+rust+yaml */
2+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+markup-templating+elixir+erlang+go+java+php+json+julia+kotlin+crystal+lua+django+matlab+typescript+nginx+nim+perl+sql+scss+python+jsx+rust+yaml */
33 var _self = (typeof window !== 'undefined')
44 ? window // if in browser
55 : (
@@ -1894,6 +1894,20 @@ Prism.languages.json = { · 1888 unmodified lines
18941894 }
18951895 };
18961896
1897+Prism.languages.julia= {
1898+ 'comment': {
1899+ pattern: /(^|[^\\])#.*/,
1900+ lookbehind: true
1901+ },
1902+ 'string': /("""|''')[\s\S]+?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2/,
1903+ 'keyword' : /\b(?:abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|in|let|local|macro|module|print|println|quote|return|struct|try|type|typealias|using|while)\b/,
1904+ 'boolean' : /\b(?:true|false)\b/,
1905+ 'number' : /(?:\b(?=\d)|\B(?=\.))(?:0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:[efp][+-]?\d+)?j?/i,
1906+ 'operator': /[-+*^%÷&$\\]=?|\/[\/=]?|!=?=?|\|[=>]?|<(?:<=?|[=:])?|>(?:=|>>?=?)?|==?=?|[~≠≤≥]/,
1907+ 'punctuation' : /[{}[\];(),.:]/,
1908+ 'constant': /\b(?:(?:NaN|Inf)(?:16|32|64)?)\b/
1909+};
1910+
18971911 (function (Prism) {
18981912 Prism.languages.kotlin = Prism.languages.extend('clike', {
18991913 'keyword': {