clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-05-05 16:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade codemirror to current master

Browse Source
This commit is contained in:
natecain
2014-05-06 23:30:40 +02:00
parent d1c85f53c0
commit 51f54b06f9
15 changed files with 10035 additions and 6485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/tiddlywiki/codemirror/codemirroreditor.js
View File

@@ -17,8 +17,8 @@ var CODEMIRROR_OPTIONS = "$:/config/CodeMirror", configOptions;
e.g. to allow vim key bindings
{
"require": [
"$:/plugins/tiddlywiki/codemirror/addon/dialog.js",
"$:/plugins/tiddlywiki/codemirror/addon/searchcursor.js",
"$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.js",
"$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js",
"$:/plugins/tiddlywiki/codemirror/keymap/vim.js"
],
"configuration": {
@@ -31,7 +31,7 @@ e.g. to allow vim key bindings
var EditTextWidget = require("$:/core/modules/widgets/edit-text.js")["edit-text"];
if($tw.browser) {
require("$:/plugins/tiddlywiki/codemirror/codemirror.js");
window.CodeMirror = require("$:/plugins/tiddlywiki/codemirror/lib/codemirror.js");
configOptions = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{});
@@ -59,12 +59,11 @@ EditTextWidget.prototype.postRender = function() {
lineWrapping: true,
lineNumbers: true
};
if($tw.browser && window.CodeMirror && this.editTag === "textarea") {
if(EditTextWidget.configuration) {
for (cv in EditTextWidget.configuration) { cm_opts[cv] = EditTextWidget.configuration[cv]; }
}
cm = CodeMirror.fromTextArea(this.domNodes[0], cm_opts);
cm = window.CodeMirror.fromTextArea(this.domNodes[0], cm_opts);
cm.on("change",function() {
self.saveChanges(cm.getValue());
});