Changeset 3414

Timestamp:

03/24/08 04:24:23 (10 months ago)

Author:

jun66j5

Message:

fixed #2684 - a problem that tracwysiwyg can't parse lists including citations.

Files:

• tracwysiwygplugin/0.10/tests/testcase.js (modified) (1 diff)
• tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js (modified) (2 diffs)
• tracwysiwygplugin/0.11/tests/testcase.js (modified) (1 diff)
• tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js (modified) (2 diffs)

tracwysiwygplugin/0.10/tests/testcase.js

@@ -976 +976 @@
-                "",
-                " 1. item 1" ].join("\n"));
+        });
+
+        unit.add("list + citation", function() {
+            var dom = fragment(
+                element('ol', element('li', 'item 1')),
+                element('blockquote', { 'class': 'citation' }, element("p", "citation 1")),
+                element('ul',
+                    element('li', 'item 2'),
+                    element("ol",
+                        element('li', 'item 2.1'),
+                        element('li', 'item 2.2'))),
+                element('blockquote', { 'class': 'citation' }, element("p", "citation 2 citation 3")),
+                element('ol', element('li', 'item 3')));
+            generateFragment.call(this, dom, [
+                ' 1. item 1',
+                '> citation 1',
+                ' * item 2',
+                '   1. item 2.1',
+                '   1. item 2.2',
+                '> citation 2',
+                '> citation 3',
+                ' 1. item 3' ].join("\n"));
+            generateWikitext.call(this, dom, [
+                ' 1. item 1',
+                '',
+                '> citation 1',
+                '',
+                ' * item 2',
+                '   1. item 2.1',
+                '   1. item 2.2',
+                '',
+                '> citation 2 citation 3',
+                '',
+                ' 1. item 3' ].join("\n"));
-        });
-

tracwysiwygplugin/0.10/tracwysiwyg/htdocs/wysiwyg.js

@@ -1299 +1299 @@
-
-        if (depth > quoteDepth.length) {
-Paragraph(
+ToFragment("blockquote"
-            while (depth > quoteDepth.length) {
-                openQuote((new RegExp("^(?: *>){" + (quoteDepth.length + 1) + "}")).exec(quote)[0].length, true);
@@ -1510 +1510 @@
-        var last = listDepth.length - 1;
-        if (depth > (last >= 0 ? listDepth[last] : 0)) {
-Paragraph(
+ToFragment("li"
-            openList(tag, className, start, depth);
-        }

tracwysiwygplugin/0.11/tests/testcase.js

@@ -976 +976 @@
-                "",
-                " 1. item 1" ].join("\n"));
+        });
+
+        unit.add("list + citation", function() {
+            var dom = fragment(
+                element('ol', element('li', 'item 1')),
+                element('blockquote', { 'class': 'citation' }, element("p", "citation 1")),
+                element('ul',
+                    element('li', 'item 2'),
+                    element("ol",
+                        element('li', 'item 2.1'),
+                        element('li', 'item 2.2'))),
+                element('blockquote', { 'class': 'citation' }, element("p", "citation 2 citation 3")),
+                element('ol', element('li', 'item 3')));
+            generateFragment.call(this, dom, [
+                ' 1. item 1',
+                '> citation 1',
+                ' * item 2',
+                '   1. item 2.1',
+                '   1. item 2.2',
+                '> citation 2',
+                '> citation 3',
+                ' 1. item 3' ].join("\n"));
+            generateWikitext.call(this, dom, [
+                ' 1. item 1',
+                '',
+                '> citation 1',
+                '',
+                ' * item 2',
+                '   1. item 2.1',
+                '   1. item 2.2',
+                '',
+                '> citation 2 citation 3',
+                '',
+                ' 1. item 3' ].join("\n"));
-        });
-

tracwysiwygplugin/0.11/tracwysiwyg/htdocs/wysiwyg.js

@@ -1299 +1299 @@
-
-        if (depth > quoteDepth.length) {
-Paragraph(
+ToFragment("blockquote"
-            while (depth > quoteDepth.length) {
-                openQuote((new RegExp("^(?: *>){" + (quoteDepth.length + 1) + "}")).exec(quote)[0].length, true);
@@ -1510 +1510 @@
-        var last = listDepth.length - 1;
-        if (depth > (last >= 0 ? listDepth[last] : 0)) {
-Paragraph(
+ToFragment("li"
-            openList(tag, className, start, depth);
-        }