infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Add C, C++, Objective-C and Java to the list of languages in the code app

pull/1/head
yflory 2019-01-15 14:34:11 +01:00
parent b4aae68c0c
commit 6fa7b147e9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/modes.js
View File

@ -10,6 +10,8 @@ define([
"ASN.1 asn.1",
"Asterisk asterisk",
"Brainfuck brainfuck .b",
"C text/x-csrc .c",
"C text/x-c++src .cpp",
"C-like clike",
"Clojure clojure",
"CMake cmake",
@ -48,6 +50,7 @@ define([
"HTTP http",
"IDL idl",
"JADE jade",
"Java text/x-java .java",
"JavaScript javascript .js",
"Jinja2 jinja2",
"JSX jsx .jsx",
@ -65,6 +68,7 @@ define([
"Nginx nginx",
"NSIS nsis",
"N-Triples ntriples",
"Objective-C text/x-objectivec .m",
"Octave octave",
"Org-mode orgmode .org",
"Oz oz",

11
www/common/sframe-common-codemirror.js
View File

@ -154,10 +154,15 @@ define([
var setMode = exp.setMode = function (mode, cb) {
exp.highlightMode = mode;
if (mode === 'markdown') { mode = 'gfm'; }
if (mode !== "text") {
CMeditor.autoLoadMode(editor, mode);
if (/text\/x/.test(mode)) {
CMeditor.autoLoadMode(editor, 'clike');
editor.setOption('mode', mode);
} else {
if (mode !== "text") {
CMeditor.autoLoadMode(editor, mode);
}
editor.setOption('mode', mode);
}
editor.setOption('mode', mode);
if (exp.$language) {
var name = exp.$language.find('a[data-value="' + mode + '"]').text() || undefined;
name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton;