Changeset 1663

Timestamp:

2008-02-29 11:13:57 (8 months ago)

Author:

martinkou

Message:

Fixed #957 : Pressing Enter or typing after a placeholder with the placeholder plugin will no longer generate colored text.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck_gecko.js (modified) (1 diff)
• _whatsnew.html (modified) (2 diffs)

FCKeditor/trunk/editor/_source/internals/fck_gecko.js

@@ -105 +105 @@
                         // only perform the patched behavior if we're in an <a> tag, or the End key is pressed.
                         var parentTag = node.parentNode.tagName.toLowerCase() ;
-                        if ( ! (  parentTag == 'a' ||
+                        if ( ! (  parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' ||
                                         ( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] )
                                           && keyCode == 35 ) ) )

FCKeditor/trunk/_whatsnew.html

@@ -47 +47 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1933">#1933</a>] Placeholder
                         dialog will now display the placeholder value correctly in IE.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/957">#957</a>] Pressing Enter 
+                        or typing after a placeholder with the placeholder plugin will no longer generate 
+                        colored text.</li>
         </ul>
         <h3>
@@ -149 +152 @@
                         of depreciated "var").</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration:
-                        removed closing tag: "?>", so no additional whitespace added when files are included.</li>
+                        removed closing tag: "?&gt;", so no additional whitespace added when files are included.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1906">#1906</a>] PHP file
                         browser: fixed problems with DetectHtml() function when open_basedir was set.</li>