Item14288: new NATEDIT_OPTIONS preference setting

- new vim keybindings: enable with * Set NATEDIT_OPTIONS = data-codemirror='{"keyMap":"vim"}' - fixed action=form - new fullscreen mode independent of the actual editor engine - improved NatEditor shell api to be able to bind ex commands :w, :x and :q
foswiki · Apr 5, 2017 · d17154e · d17154e
1 parent 602136c
commit d17154e
Show file tree

Hide file tree

Showing 7 changed files with 345 additions and 261 deletions.
diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js
@@ -66,6 +66,11 @@ CodemirrorEngine.prototype.init = function() {
     .attr({type : 'text/css', rel : 'stylesheet'})
     .attr('href', editorPath + '/addon/search/matchesonscrollbar.css');
 
+  $('<link>')
+    .appendTo('head')
+    .attr({type : 'text/css', rel : 'stylesheet'})
+    .attr('href', editorPath + '/addon/dialog/dialog.css');
+
   self.shell.getScript(editorPath+"/lib/codemirror.js").done(function() {
     CodeMirror.modeURL = editorPath+'/'+'/mode/%N/%N.js';
 
@@ -76,18 +81,33 @@ CodemirrorEngine.prototype.init = function() {
       self.shell.getScript(editorPath+"/addon/search/searchcursor.js"),
       self.shell.getScript(editorPath+"/addon/scroll/annotatescrollbar.js"),
       self.shell.getScript(editorPath+"/addon/search/matchesonscrollbar.js"),
+      self.shell.getScript(editorPath+"/addon/dialog/dialog.js"),
       self.shell.getScript(editorPath+"/widgets/widgets.js"),
+      self.shell.getScript(editorPath+"/keymap/vim.js"),
       self.shell.preloadDialog("searchdialog")
     ).done(function() {
 
+        // extend vim mode to make :w and :x work
+        CodeMirror.commands.save = function() {
+          self.shell.save();
+        };
+
+        CodeMirror.Vim.defineEx("x", undefined, function() {
+          self.shell.exit();
+        });
+
+        CodeMirror.Vim.defineEx("q", undefined, function() {
+          self.shell.cancel();
+        });
+
         CodeMirror.requireMode(self.opts.mode || 'foswiki', function() {
           var $txtarea = $(self.shell.txtarea),
               cols = $txtarea.attr("cols"),
               rows = $txtarea.attr("rows"),
               lineHeight = parseInt($txtarea.css("line-height"), 10);
 
           self.cm = CodeMirror.fromTextArea(self.shell.txtarea, self.opts); 
-          window.cm = self.cm; //playground
+          //window.cm = self.cm; //playground
 
           if (typeof(cols) !== 'undefined' && cols > 0) {
             self.cm.setSize(cols+"ch");
@@ -115,14 +135,11 @@ CodemirrorEngine.prototype.init = function() {
               },
               "F3": function() {
                 self.search();
-              },
-              "Esc": function() {
-                self._searchDialogOpen = false;
-                self.clearSearchState();
-            }
+              }
           });
           self.cm.setOption("extraKeys", extraKeys);
 
+/*
           $(window).on("keydown", function(e) { // suppress global ctrl-f
             if (e.keyCode === 114 || (e.ctrlKey && e.keyCode === 70)) {
               // when we have only a single natedit on a page, then global ctrl-f opens the search dialog
@@ -134,7 +151,7 @@ CodemirrorEngine.prototype.init = function() {
               return false;
             }
           });
-
+*/
 /*
           self.cm.on("change", function(cm, change) {
             self.updateWidgets(change);
@@ -550,7 +567,7 @@ CodemirrorEngine.defaults = {
   indentWithTabs: false, 
   //rtlMoveVisually
   electricChars: false,
-  keyMap: "default",
+  keyMap: "default", // or vim
   lineWrapping: true,
   lineNumbers: false, 
   firstLineNumber: 1,

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/i18n/de.js b/NatEditPlugin/pub/System/NatEditPlugin/i18n/de.js
@@ -1,5 +1,6 @@
 {
   "Saving ...": "Speichere ...",
+  "Quitting ...": "Beende ...",
   "Loading preview ...": "Lade Vorschau ...",
   "uploading ...": "lade hoch ...",
   "abording transfer ...": "breche Transfer ab ...",