mirror of
https://github.com/TiddlyWiki/TiddlyWiki5.git
synced 2026-05-05 09:36:57 +00:00
Merge branch 'master' into colour-improvements
This commit is contained in:
@@ -6,15 +6,10 @@ module-type: widget
|
||||
Edit-codemirror widget
|
||||
|
||||
\*/
|
||||
(function(){
|
||||
|
||||
/*jslint node: true, browser: true */
|
||||
/*global $tw: false */
|
||||
"use strict";
|
||||
|
||||
var editTextWidgetFactory = require("$:/core/modules/editor/factory.js").editTextWidgetFactory,
|
||||
CodeMirrorEngine = require("$:/plugins/tiddlywiki/codemirror/engine.js").CodeMirrorEngine;
|
||||
|
||||
exports["edit-codemirror"] = editTextWidgetFactory(CodeMirrorEngine,CodeMirrorEngine);
|
||||
|
||||
})();
|
||||
|
||||
@@ -6,10 +6,7 @@ module-type: library
|
||||
Text editor engine based on a CodeMirror instance
|
||||
|
||||
\*/
|
||||
(function(){
|
||||
|
||||
/*jslint node: true, browser: true */
|
||||
/*global $tw: false */
|
||||
"use strict";
|
||||
|
||||
var CODEMIRROR_OPTIONS = "$:/config/CodeMirror",
|
||||
@@ -316,5 +313,3 @@ CodeMirrorEngine.prototype.executeTextOperation = function(operation) {
|
||||
};
|
||||
|
||||
exports.CodeMirrorEngine = $tw.browser ? CodeMirrorEngine : require("$:/core/modules/editor/engines/simple.js").SimpleEngine;
|
||||
|
||||
})();
|
||||
|
||||
Reference in New Issue
Block a user