Changeset 4936

Timestamp:

05/14/08 04:32:49 (5 months ago)

Author:

MartinBudden

Message:

Fixed bug in list level. Changed \\n to br instead of p

Files:

• Trunk/contributors/MartinBudden/formatters/ConfluenceFormatterPlugin.js (modified) (6 diffs)

Trunk/contributors/MartinBudden/formatters/ConfluenceFormatterPlugin.js

@@ -5 +5 @@
 |''Source:''|http://www.martinswiki.com/#ConfluenceFormatterPlugin |
 |''CodeRepository:''|http://svn.tiddlywiki.org/Trunk/contributors/MartinBudden/formatters/ConfluenceFormatterPlugin.js |
-|''Version:''|0.1.3|
+|''Version:''|0.1.4|
 |''Date:''|Dec 8, 2006|
 |''Comments:''|Please make comments at http://groups.google.co.uk/group/TiddlyWikiDev |
@@ -210 +210 @@
                         w.subWikifyTerm(cell,this.cellTermRegExp);
                         if(cellMatch[1]) {
-                                // End of row
+                                //# End of row
                                 w.nextMatch = this.cellRegExp.lastIndex;
                                 return true;
                         } else {
-                                // Cell
+                                //# Cell
                                 w.nextMatch--;
                         }
@@ -239 +239 @@
                         var style = lookaheadMatch[3] ? 'square' : null;
                         listType = lookaheadMatch[1] ? 'ol' : 'ul';
-                        listLevel = lookaheadMatch[0].length;
+                        listLevel = lookaheadMatch[0].length - 1;
                         w.nextMatch += listLevel;
                         if(listLevel > currLevel){
@@ -320 +320 @@
         name: 'confluenceExternalLink',
         match: '(?:".*?" ?):?[a-z]{2,8}:',
-        lookaheadRegExp: /(?:\"(.*?)(?:\((.*?)\))?\" ?):?(.*?)(?=\s|$)/mg,
+        lookaheadRegExp: /(?:\"(.*?)(?:\((.*?)\))?\" ?):?(.*?)(?=\s|$)/mg, //"
         handler: function(w)
         {
@@ -446 +446 @@
 },
 {
-        name: 'confluenceParagraph',
+        name: 'confluenceBreak',
         match: '\\n{2,}',
         handler: function(w)
         {
-                createTiddlyElement(w.output,'p');
+                createTiddlyElement(w.output,'br');
         }
 },
@@ -523 +523 @@
         name: 'confluenceHtmlTag',
         match: "<(?:[a-zA-Z]{2,}|a)(?:\\s*(?:(?:.*?)=[\"']?(?:.*?)[\"']?))*?>",
-        lookaheadRegExp: /<([a-zA-Z]+)((?:\s+(?:.*?)=["']?(?:.*?)["']?)*?)?\s*(\/)?>(?:\n?)/mg,
+        lookaheadRegExp: /<([a-zA-Z]+)((?:\s+(?:.*?)=["']?(?:.*?)["']?)*?)?\s*(\/)?>(?:\n?)/mg, //'
         handler: function(w)
         {