Ticket #5121: 5121_3.patch

_source/plugins/styles/plugin.js

@@ -104 +104 @@
 
                 this._ =
                 {
-                        definition : styleDefinition
+                        definition : styleDefinition,
+                        enterMode  : CKEDITOR.ENTER_P
                 };
         };
 
@@ -752 +753 @@
 
                 var iterator = range.createIterator();
                 iterator.enforceRealBlocks = true;
+                
+                // make recognize <br /> tag as a separator in ENTER_BR mode (#5121)
+                iterator.enlargeBr = ( this._.enterMode != CKEDITOR.ENTER_BR );
 
                 var block;
                 var doc = range.document;

_source/plugins/stylescombo/plugin.js

@@ -34 +34 @@
 
                                                         style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
                                                         style._name = styleName;
+                                                        style._.enterMode = config.enterMode;
 
                                                         stylesList.push( style );
                                                 }