Item2618: Merge to trunk (fix __caret span tinymce artifact)

git-svn-id: http://svn.foswiki.org/branches/Release01x00@6134 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 24, 2010 · 20fd86d · 20fd86d
1 parent 261bd45
commit 20fd86d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm
@@ -1169,6 +1169,16 @@ sub cleanNode {
             delete $this->{attrs}->{$a};
         }
     }
+
+    # Sometimes (rarely!) there's a <span id='__caret'> </span>, an artifact of 
+    # one of the strategies TinyMCE uses to recover lost cursor positioning, see 
+    # Item2618 where this can break TML tables. #SMELL: TMCE specific
+    if ( ( $this->{tag} eq 'span' ) && ( defined $this->{attrs}->{id} ) && 
+        ( $this->{attrs}->{id} eq '__caret' ) ) {
+        $this->{tag} = q{};
+        $this->{attrs} = {};
+        $this->{nodeType} = 0; #PROCESSING_INSTRUCTION_NODE
+    }
 }
 
 ######################################################

diff --git a/WysiwygPlugin/test/unit/WysiwygPlugin/ExtendedTranslatorTests.pm b/WysiwygPlugin/test/unit/WysiwygPlugin/ExtendedTranslatorTests.pm
@@ -396,6 +396,18 @@ DOT
         tml => '<img src="%PUBURLPATH%">',
         html => '<div class="WYSIWYG_PROTECTED">&lt;img&nbsp;src="%PUBURLPATH%"&gt;</div>'
     },
+    {
+        name => 'Item2618_ExtraneousCaretMarkerInTables',
+        exec => $HTML2TML | $ROUNDTRIP,
+        html => <<'HERE',
+<table border="0"> <tbody> 
+  <tr> <td>Foo</td> <span id="__caret"> </span> <td>a</td> </tr>
+</tbody> </table>
+HERE
+        tml => <<'HERE',
+| Foo | a |
+HERE
+    },
 ];
 
 sub gen_compare_tests {