Item14288: fixed editor initialization

- implemented highlighting of toolbar based on cursor position
foswiki · Dec 4, 2017 · cc3f3c5 · cc3f3c5
1 parent 6126dec
commit cc3f3c5
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 174 deletions.
diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/NATEDIT.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/NATEDIT.pm
@@ -106,6 +106,7 @@ sub init {
   }
 }</script>
 HERE
+
 }
 
 # SMELL: see for Foswiki::Plugins::TinyMCEPLugin::_notAvailable

diff --git a/NatEditPlugin/locale/NatEditPlugin/de.po b/NatEditPlugin/locale/NatEditPlugin/de.po
@@ -109,7 +109,7 @@ msgstr "Datum"
 
 #: templates/edit.natedit.tmpl:116 templates/edit.natedit.tmpl:152
 msgid "Default"
-msgstr "Default"
+msgstr "Standard"
 
 #: data/System/NatEditWordHelpText.txt:16
 msgid "Documentation"
@@ -561,7 +561,7 @@ msgstr "kennzeichnet Pflichtfelder"
 
 #: templates/edit.natedit.tmpl:10
 msgid "new"
-msgstr "Neu"
+msgstr "neu"
 
 #: templates/edit.natedit.tmpl:119
 msgid "public view access"

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js
@@ -36,7 +36,7 @@ CodemirrorEngine.prototype.parent = BaseEngine.prototype;
 function CodemirrorEngine(shell, opts) {
   var self = this;
 
-  self.shell = shell;
+  self.shell = self.parent.shell = shell; // SMELL
   self.searchState = undefined;
   self.opts = $.extend({}, CodemirrorEngine.defaults, self.shell.opts.codemirror, opts);
 }
@@ -51,6 +51,7 @@ CodemirrorEngine.prototype.init = function() {
       editorPath = pubUrlPath+'/'+systemWeb+'/CodeMirrorContrib',
       dfd = $.Deferred();
 
+
   $('<link>')
     .appendTo('head')
     .attr({type : 'text/css', rel : 'stylesheet'})
@@ -75,6 +76,7 @@ CodemirrorEngine.prototype.init = function() {
     CodeMirror.modeURL = editorPath+'/'+'/mode/%N/%N.js';
 
     $.when(
+      self.parent.init(),
       self.shell.getScript(editorPath+"/addon/mode/loadmode.js"),
       self.shell.getScript(editorPath+"/addon/fold/foldcode.js"),
       self.shell.getScript(editorPath+"/addon/fold/foldgutter.js"),
@@ -85,7 +87,7 @@ CodemirrorEngine.prototype.init = function() {
       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")
+      self.shell.preloadTemplate("editdialog", "searchdialog")
     ).done(function() {
 
         // extend vim mode to make :w and :x work

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/raw/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/raw/engine.uncompressed.js
@@ -306,7 +306,11 @@ RawEngine.prototype.init = function() {
     }
   }); 
 
-  dfd.resolve(self);
+  $.when(
+    self.parent.init()
+  ).done(function() {
+    dfd.resolve(self);
+  });
 
   return dfd.promise();
 };

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/tinymce/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/tinymce/engine.uncompressed.js
@@ -51,7 +51,10 @@ TinyMCEEngine.prototype.init = function() {
     .attr({type : 'text/css', rel : 'stylesheet'})
     .attr('href', editorPath + '/wysiwyg.css');
 
-  self.shell.getScript(editorPath+'/tinymce/js/tinymce/tinymce.min.js').done(function() {
+  $.when(
+    self.parent.init(),
+    self.shell.getScript(editorPath+'/tinymce/js/tinymce/tinymce.min.js')
+  ).done(function() {
 
     self.opts.tinymce.init_instance_callback = function(editor) {
 

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/tinymce_native/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/tinymce_native/engine.uncompressed.js
@@ -28,7 +28,7 @@ function TinyMCENativeEngine(shell, opts) {
   self.shell = shell;
   self.opts = $.extend({}, TinyMCENativeEngine.defaults, opts);
   self.opts.natedit.showToolbar = false;
-  self.editor = tinymce.editors[0];
+  self.editor = tinymce.editors[0]; // SMELL
 
   $.extend(self.shell.opts, self.opts.natedit);
 }
@@ -40,9 +40,8 @@ TinyMCENativeEngine.prototype.initGui = function() {
   var self = this, $txtarea = $(self.shell.txtarea);
 
   $txtarea.on("fwSwitchToRaw", function(/*ev, editor*/) {
-    self.shell.showToolbar().then(function() {
-      self.shell.toolbar.find(".ui-natedit-switch-to-wysiwyg").show();
-    });
+    self.shell.showToolbar();
+    self.shell.toolbar.find(".ui-natedit-switch-to-wysiwyg").show();
   }).on("fwSwitchToWYSIWYG", function() {
     self.shell.hideToolbar();
     $(document).trigger("resize");