Item14288: working on dialogs

- insert link will also insert attachments now - the separate insert attachment is gone - instead there is a new insert image now (not yet functional)
foswiki · Apr 5, 2017 · 602136c · 602136c
1 parent d7114cb
commit 602136c
Show file tree

Hide file tree

Showing 30 changed files with 103,697 additions and 396 deletions.
diff --git a/NatEditPlugin/locale/NatEditPlugin/Foswiki.pot b/NatEditPlugin/locale/NatEditPlugin/Foswiki.pot
diff --git a/NatEditPlugin/locale/NatEditPlugin/bg.po b/NatEditPlugin/locale/NatEditPlugin/bg.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/cs.po b/NatEditPlugin/locale/NatEditPlugin/cs.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/da.po b/NatEditPlugin/locale/NatEditPlugin/da.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/de.po b/NatEditPlugin/locale/NatEditPlugin/de.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/el.po b/NatEditPlugin/locale/NatEditPlugin/el.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/es.po b/NatEditPlugin/locale/NatEditPlugin/es.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/fi.po b/NatEditPlugin/locale/NatEditPlugin/fi.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/fr.po b/NatEditPlugin/locale/NatEditPlugin/fr.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/it.po b/NatEditPlugin/locale/NatEditPlugin/it.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/ja.po b/NatEditPlugin/locale/NatEditPlugin/ja.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/ko.po b/NatEditPlugin/locale/NatEditPlugin/ko.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/nl.po b/NatEditPlugin/locale/NatEditPlugin/nl.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/no.po b/NatEditPlugin/locale/NatEditPlugin/no.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/pl.po b/NatEditPlugin/locale/NatEditPlugin/pl.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/pt-br.po b/NatEditPlugin/locale/NatEditPlugin/pt-br.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/pt.po b/NatEditPlugin/locale/NatEditPlugin/pt.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/ru.po b/NatEditPlugin/locale/NatEditPlugin/ru.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/sv.po b/NatEditPlugin/locale/NatEditPlugin/sv.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/tlh.po b/NatEditPlugin/locale/NatEditPlugin/tlh.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/tr.po b/NatEditPlugin/locale/NatEditPlugin/tr.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/uk.po b/NatEditPlugin/locale/NatEditPlugin/uk.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/zh-cn.po b/NatEditPlugin/locale/NatEditPlugin/zh-cn.po
diff --git a/NatEditPlugin/locale/NatEditPlugin/zh-tw.po b/NatEditPlugin/locale/NatEditPlugin/zh-tw.po
diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/base/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/base/engine.uncompressed.js
@@ -249,6 +249,108 @@ BaseEngine.prototype.insertTable = function(opts) {
   self.insert(table);
 };
 
+/***************************************************************************
+ * insert a link
+ * opts is a hash of params that can have either of two forms:
+ *
+ * insert a link to a topic:
+ * {
+ *   web: "TheWeb",
+ *   topic: "TheTopic",
+ *   text: "the link text" (optional)
+ * }
+ *
+ * insert an external link:
+ * {
+ *   url: "http://...",
+ *   text: "the link text" (optional)
+ * }
+ *
+ * insert an attachment link:
+ * {
+ *   web: "TheWeb",
+ *   topic: "TheTopic",
+ *   file: "TheAttachment.jpg",
+ *   text: "the link text" (optional)
+ * }
+ */
+BaseEngine.prototype.insertLink = function(opts) {
+  var self = this, markup;
+
+console.log("insertLink opts=",opts);
+
+  if (typeof(opts.url) !== 'undefined') {
+    // external link
+    if (typeof(opts.url) === 'undefined' || opts.url === '') {
+      return; // nop
+    }
+
+    if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+      markup = "[["+opts.url+"]["+opts.text+"]]";
+    } else {
+      markup = "[["+opts.url+"]]";
+    }
+  } else if (typeof(opts.file) !== 'undefined') {
+    // attachment link
+
+    if (typeof(opts.web) === 'undefined' || opts.web === '' || 
+        typeof(opts.topic) === 'undefined' || opts.topic === '') {
+      return; // nop
+    }
+
+    if (opts.file.match(/\.(bmp|png|jpe?g|gif|svg)$/i) && foswiki.getPreference("NatEditPlugin").ImagePluginEnabled) {
+      markup = '%IMAGE{"'+opts.file+'"';
+      if (opts.web !== self.shell.opts.web || opts.topic !== self.shell.opts.topic) {
+        markup += ' topic="';
+        if (opts.web !== self.shell.opts.web) {
+          markup += opts.web+'.';
+        }
+        markup += opts.topic+'"';
+      }
+      if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+        markup += ' caption="'+opts.text+'"';
+      }
+      markup += ' size="320"}%';
+    } else {
+      // linking to an ordinary attachment
+
+      if (opts.web === self.shell.opts.web && opts.topic === self.shell.opts.topic) {
+        markup = "[[%ATTACHURLPATH%/"+opts.file+"]";
+      } else {
+        markup = "[[%PUBURLPATH%/"+opts.web+"/"+opts.topic+"/"+opts.file+"]";
+      }
+
+      if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+        markup += "["+opts.text+"]";
+      } else {
+        markup += "["+opts.file+"]";
+      }
+      markup += "]";
+    }
+
+  } else {
+    // wiki link
+
+    if (typeof(opts.topic) === 'undefined' || opts.topic === '') {
+      return; // nop
+    }
+
+    if (opts.web === self.shell.opts.web) {
+      markup = "[["+opts.topic+"]";
+    } else {
+      markup = "[["+opts.web+"."+opts.topic+"]";
+    }
+
+    if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+      markup += "["+opts.text+"]";
+    } 
+    markup += "]";
+  }
+
+  self.remove();
+  self.insert(markup);
+};
+
 /*****************************************************************************
  * parse the current selection into a two-dimensional array
  * to be used initializing a table. rows are separated by \n, columns by whitespace

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/codemirror/engine.uncompressed.js
@@ -334,7 +334,6 @@ CodemirrorEngine.prototype.insertLineTag = function(markup) {
   doc.setSelection(start, end);
 
   self.cm.focus();
-
 };
 
 /*************************************************************************

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/engine/tinymce/engine.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/engine/tinymce/engine.uncompressed.js
@@ -75,6 +75,7 @@ TinyMCEEngine.prototype.init = function() {
           alert("Error calling tml2html"); // SMELL: better error handling
         });
 
+/*
       self.on("BeforeSetContent", function(ev) {  
         if (foswiki.getPreference("NatEditPlugin").ImagePluginEnabled) {
           var paramsRegex = /(?:(\w+?)=)?&#34;(.*?)&#34;/g;
@@ -103,6 +104,7 @@ TinyMCEEngine.prototype.init = function() {
         }
       });
       self.on("GetContent", function() { console.log("got GetContent event"); });
+*/
     };
 
     tinymce.init(self.opts.tinymce);
@@ -428,6 +430,96 @@ TinyMCEEngine.prototype.insertTable = function(opts) {
   self.insert(table);
 };
 
+/***************************************************************************
+ * insert a link
+ * opts is a hash of params that can have either of two forms:
+ *
+ * insert a link to a topic:
+ * {
+ *   web: "TheWeb",
+ *   topic: "TheTopic",
+ *   text: "the link text" (optional)
+ * }
+ *
+ * insert an external link:
+ * {
+ *   url: "http://...",
+ *   text: "the link text" (optional)
+ * }
+ *
+ * insert an attachment link:
+ * {
+ *   web: "TheWeb",
+ *   topic: "TheTopic",
+ *   file: "TheAttachment.jpg",
+ *   text: "the link text" (optional)
+ * }
+ */
+TinyMCEEngine.prototype.insertLink = function(opts) {
+  var self = this, markup, link;
+
+  //console.log("called insertLink",opts);
+
+  if (typeof(opts.url) !== 'undefined') {
+    if (opts.url === '') {
+      return; // nop
+    }
+
+    if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+      markup = "<a href='"+opts.url+"'>"+opts.text+"</a>";
+    } else {
+      markup = "<a href='"+opts.url+"'>"+opts.url+"</a>";
+    }
+  } else if (typeof(opts.file) !== 'undefined') {
+    // attachment link
+
+    if (typeof(opts.web) === 'undefined' || opts.web === '' || 
+        typeof(opts.topic) === 'undefined' || opts.topic === '') {
+      return; // nop
+    }
+
+    link = '%PUBURLPATH%/'+opts.web+'/'+opts.topic+'/'+opts.file;
+
+    if (opts.file.match(/\.(bmp|png|jpe?g|gif|svg)$/i) && !opts.text) {
+      markup = "<img src='"+link+"' alt='"+opts.file+"' height='320' />";
+    } else {
+      // linking to an ordinary attachment
+
+      markup = "<a href='"+link+"'>";
+
+      if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+        markup += opts.text;
+      } else {
+        markup += opts.file;
+      }
+      markup += "</a>";
+    }
+
+  } else {
+    // wiki link
+
+    if (typeof(opts.topic) === 'undefined' || opts.topic === '') {
+      return; // nop
+    }
+
+    link = opts.web+'.'+opts.topic; // converted by WysiwygPlugin
+
+    markup = "<a href='"+link+"'>";
+
+    if (typeof(opts.text) !== 'undefined' && opts.text !== '') {
+      markup += opts.text;
+    }  else {
+      markup += opts.topic;
+    }
+    markup += "</a>";
+  }
+
+  //console.log("markup=",markup);
+
+  self.remove();
+  self.insert(markup);
+};
+
 /*************************************************************************
  * set the value of the editor
  */
@@ -484,7 +576,7 @@ TinyMCEEngine.defaults = {
     menubar: false,
     toolbar: false,
     statusbar: false,
-    plugins: 'contextmenu table searchreplace paste lists link anchor hr legacyoutput image textpattern', // save autosave fullscreen anchor charmap code textcolor colorpicker
+    plugins: 'table searchreplace paste lists link anchor hr legacyoutput image textpattern', // save autosave fullscreen anchor charmap code textcolor colorpicker
     table_toolbar : "tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol",
     table_appearance_options: false,
     table_advtab: false,
@@ -493,6 +585,11 @@ TinyMCEEngine.defaults = {
     object_resizing: "img",
     paste_data_images: true,
     content_css: [],
+    style_formats_autohide: true,
+    removeformat: [{ 
+      selector: 'div,p,pre', 
+      remove: 'all' 
+    }],
     formats: {
       h1Markup: { block: "h1", toolbar: ".ui-natedit-h1" },
       h2Markup: { block: "h2", toolbar: ".ui-natedit-h2" },