web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

infer modes from MIME types

Browse Source
This commit is contained in:
ansuz 2016-06-23 16:37:51 +02:00
parent ba2128663b
commit 5b79775810
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
www/code/main.js
View File

@ -52,6 +52,10 @@ define([
}); });
var setMode = module.setMode = function (mode) { var setMode = module.setMode = function (mode) {
if (mode === 'text') {
editor.setOption('mode', 'text');
return;
}
CodeMirror.autoLoadMode(editor, mode); CodeMirror.autoLoadMode(editor, mode);
editor.setOption('mode', mode); editor.setOption('mode', mode);
}; };
@ -155,9 +159,22 @@ define([
$bar.find('#cryptpad-saveContent').click(exportText); $bar.find('#cryptpad-saveContent').click(exportText);
$bar.find('#cryptpad-loadContent') $bar.find('#cryptpad-loadContent')
.click(Cryptpad.importContent('text/plain', function (content) { .click(Cryptpad.importContent('text/plain', function (content, file) {
var mime = CodeMirror.findModeByMIME(file.type);
var mode = mime && mime.mode || null;
if (Modes.some(function (o) { return o.mode === mode; })) {
setMode(mode);
$bar.find('#language-mode').val(mode);
} else {
console.log("Couldn't find a suitable highlighting mode: %s", mode);
setMode('text');
$bar.find('#language-mode').val('text');
}
editor.setValue(content); editor.setValue(content);
config.onLocal(); onLocal();
})); }));
var dropdown = '<select id="language-mode">\n' + var dropdown = '<select id="language-mode">\n' +
@ -170,9 +187,9 @@ define([
$bar.find('.rtwysiwyg-toolbar-rightside').append(dropdown); $bar.find('.rtwysiwyg-toolbar-rightside').append(dropdown);
$bar.find('#language-mode').on('change', function () { var $language = $bar.find('#language-mode').on('change', function () {
console.log($(this).val()); var mode = $language.val();
setMode($(this).val()); setMode(mode);
}); });
window.location.hash = info.channel + secret.key; window.location.hash = info.channel + secret.key;

1
www/code/modes.js
View File

@ -97,6 +97,7 @@ define(function () {
"stylus stylus", "stylus stylus",
"swift swift", "swift swift",
"tcl tcl", "tcl tcl",
"text text",
"textile textile", "textile textile",
"tiddlywiki tiddlywiki", "tiddlywiki tiddlywiki",
"tiki tiki", "tiki tiki",