Ticket #3526: 3526_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -371 +371 @@
                                                         },
                                                         0 );
                                         };
-
+                                        var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|&#160;)\s*(:?<\/\1>)?\s*$/gi;
                                         editor.addMode( 'wysiwyg',
                                                 {
                                                         load : function( holderElement, data, isSnapshot )
@@ -456 +456 @@
                                                                 if ( editor.dataProcessor )
                                                                         data = editor.dataProcessor.toDataFormat( data, ( editor.config.enterMode != CKEDITOR.ENTER_BR ) );
 
+                                                                // Strip the last blank paragraph within document.
+                                                                if ( editor.config.ignoreEmptyParagraph )
+                                                                        data = data.replace( emptyParagraphRegexp, '' );
+
                                                                 return data;
                                                         },
 
@@ -533 +537 @@
  * config.disableNativeSpellChecker = false;
  */
 CKEDITOR.config.disableNativeSpellChecker = true;
+/**
+ * The editor will post an empty value ("") if you have just an empty paragraph on it, like this:
+ * @example
+ * <p></p>
+ * <p><br /></p>
+ * <p><b></b></p>
+ */
+CKEDITOR.config.ignoreEmptyParagraph = true;